<!doctype html>
<html lang="ru" data-bs-theme="dark">

<head>
    <!-- 2024-05-07 12:28:58 -->
        <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <title>Git - gitattributes</title>
        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css" integrity="sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-icons/1.11.3/font/bootstrap-icons.min.css" integrity="sha512-dPXYcDub/aeb08c63jRq/k6GaKccl256JQy/AnOq7CAnEZ9FzSL9wSbcZkMp4R26vBsMLFYH4kQ67/bbV8XaCQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github-dark.min.css" integrity="sha512-rO+olRTkcf304DQBxSWxln8JXCzTHlKnIdnMUwYvQa9/Jd4cQaNkItIUj6Z4nvW1dqK0SKXLbn9h4KwZTNtAyw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/7.1.0/css/flag-icons.min.css" integrity="sha512-bZBu2H0+FGFz/stDN/L0k8J0G8qVsAL0ht1qg5kTwtAheiXwiRKyCq1frwfbSFSJN3jooR5kauE0YjtPzhZtJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
    <link href="../../../runebook.css" rel="stylesheet" type="text/css">
    <meta name="x-github" content="https://github.com/runebookdev/runebook">
            <meta name="x-i18n-doc" content="git">
        <script>
        function i18n(element) {
            // NOP
        }
    </script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.5/js.cookie.js" integrity="sha512-F/dia2jKME12jwqiYDayeD+Rr/8jTWUD2wfbuJB0bzSwenSEnXsn4qQ/wVyXUCix5bmCAj8xJdtFr2OqUtjLAw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js" integrity="sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/rxjs/7.8.1/rxjs.umd.min.js" integrity="sha512-D9LDs8YUUVa4V9Gl4Zb+xqRAc7RCzooR3+zzebgK2RMu/KU+dh90pbjEEMzPiSyRSGbSp9j1pZnrO4joGa5WEg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/jquery.mark.min.js" integrity="sha512-mhbv5DqBMgrWL+32MmsDOt/OAvqr/cHimk6B8y/bx/xS88MVkYGPiVv2ixKVrkywF2qHplNRUvFsAHUdxZ3Krg==" crossorigin="anonymous"></script>
    <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6424571640879890" crossorigin="anonymous"></script>    <script async src="https://www.googletagmanager.com/gtag/js?id=G-3G5BZ1QEDP"></script>
<script>
    window.dataLayer = window.dataLayer || [];

    function gtag() {
        dataLayer.push(arguments);
    }

    gtag('js', new Date());
    gtag('config', 'G-3G5BZ1QEDP');
</script>    <script>
(function(c, l, a, r, i, t, y) {
    c[a] = c[a] || function() {
        (c[a].q = c[a].q || []).push(arguments)
    };
    t = l.createElement(r);
    t.async = 1;
    t.src = "https://www.clarity.ms/tag/" + i + "?ref=bwt";
    y = l.getElementsByTagName(r)[0];
    y.parentNode.insertBefore(t, y);
})(window, document, "clarity", "script", "jto2hd94r9");
</script>    <script src="../../../theme.js"></script>
</head>

<body>
    <header class="bg-black">
        <div class="container">
            <div class="row">
                <div class="col">
                    <nav class="navbar navbar-expand-lg navbar-dark">
                        <a class="navbar-brand fw-bold" href="https://runebook.dev/ru">
                            <img alt="Runebook.dev" class="d-inline-block align-top mr-1" src="../../../assets/runebook_logo.webp" width="24" height="24">
                            Runebook.dev
                        </a>
                        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                            <span class="navbar-toggler-icon"></span>
                        </button>
                        <div class="collapse navbar-collapse" id="navbarSupportedContent">
                            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/ru#docs">Documentation</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://runebook.dev/contributors">Contributors</a>
                                </li>
                                <li class="nav-item">
                                    <a class="nav-link" href="https://github.com/runebookdev/runebook/issues">GitHub</a>
                                </li>
                            </ul>
                                                                                                <button class="btn btn-success ms-2" id="showPopupButton">
                                        <i class="bi bi-translate"></i>
                                        Show English
                                    </button>
                                                                                        <div class="form-check form-switch ms-3">
                                <label class="text-light">
                                    <input class="form-check-input" type="checkbox" role="switch" id="theme-switch" checked>
                                    <i class="bi bi-moon-stars-fill"></i>
                                </label>
                            </div>
                        </div>
                    </nav>
                </div>
            </div>
        </div>
    </header>

    <!--sse-->
    <div class="container">
    <div class="row">
        <div class="col">
            <nav aria-label="breadcrumb" class="mt-2">
                <ol class="breadcrumb mb-1">
                    <li class="breadcrumb-item">
                        <a href="https://runebook.dev/ru#docs">
                            <span class="fi fi-ru"></span>                            Русский                        </a>
                    </li>
                    <li class="breadcrumb-item">
                        <a href="-index-.html">
                            Git                            2.43                        </a>
                    </li>
                                            <li class="breadcrumb-item">
                            <a href="-index-.html#Guides">
                                Guides                            </a>
                        </li>
                                    </ol>
            </nav>
        </div>
    </div>
    <br>

    <div class="row">
        <div class="col-md-9">
            <main>
                <article>

                    
                    <h1 class="text-body-emphasis" ><span data-i18n="b387e1e440a9ee0a70c8c0297fd648c5f00abd6167cb99ab63bd60fd828b5f05/45" data-source="gitattributes" onmousemove="i18n(this)">gitattributes</span></h1> <h2 class="text-body-emphasis"  id="_name"><span data-i18n="dcd1d5223f73b3a965c07e3ff5dbee3eedcfedb806686a05b9b3868a2c3d6d50/3a" data-source="Name" onmousemove="i18n(this)">Name</span></h2> <div> <p><span data-i18n="29b9eadb805df245bb94627cf0278efa6f0c231db2586f06e522d130ac398ead/58" data-source="gitattributes - Defining attributes per path" onmousemove="i18n(this)">gitattributes &mdash; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy; &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&gcy;&ocy; &pcy;&ucy;&tcy;&icy;</span></p> </div> <h2 class="text-body-emphasis"  id="_synopsis"><span data-i18n="8eb3755381519d7f0479d75446e56e20084834c0460d7ec94926932372ea6c47/0d" data-source="Synopsis" onmousemove="i18n(this)">Synopsis</span></h2> <div> <p><span data-i18n="963aec5f40cba8b925f4ba568eb7967beeb170df43619006cf35780f9f18f07b/6e" data-source="$GIT_DIR/info/attributes, .gitattributes" onmousemove="i18n(this)">$GIT_DIR/info/attributes, .gitattributes</span></p> </div> <h2 class="text-body-emphasis"  id="_description"><span data-i18n="526e0087cc3f254d9f86f6c7d8e23d954c4dfda2b312efc29194ae8a860106ba/d3" data-source="Description" onmousemove="i18n(this)">Description</span></h2> <div> <p><span data-i18n="a86bc21d489168a1f6486432ba5bf729ab6cb6b70ec999a4c2deca215df2096e/e5" data-source="A &lt;code&gt;gitattributes&lt;/code&gt; file is a simple text file that gives &lt;code&gt;attributes&lt;/code&gt; to pathnames." onmousemove="i18n(this)">&Fcy;&acy;&jcy;&lcy;  <code>gitattributes</code>  &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &scy;&ocy;&bcy;&ocy;&jcy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy;&jcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &pcy;&rcy;&icy;&scy;&vcy;&acy;&icy;&vcy;&acy;&iecy;&tcy; &icy;&mcy;&iecy;&ncy;&acy;&mcy; &pcy;&ucy;&tcy;&iecy;&jcy;  <code>attributes</code> .</span></p> <p><span data-i18n="dee813541dc8509e40e046fd750bbdcdbb4815e44fb117d879f0b1d1a960ff15/59" data-source="Each line in &lt;code&gt;gitattributes&lt;/code&gt; file is of form:" onmousemove="i18n(this)">&Kcy;&acy;&zhcy;&dcy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy;  <code>gitattributes</code>  &icy;&mcy;&iecy;&iecy;&tcy; &vcy;&icy;&dcy;:</span></p> <div> <div> <pre class="hljs language-sql"><span class="hljs-keyword">pattern</span> attr1 attr2 ...</pre> </div> </div> <p><span data-i18n="bf99db63395e249d8fd3c64dea1564f159b8f0b55670696c58a5d957cf6da36c/73" data-source="That is, a pattern followed by an attributes list, separated by whitespaces. Leading and trailing whitespaces are ignored. Lines that begin with &lt;code&gt;#&lt;/code&gt; are ignored. Patterns that begin with a double quote are quoted in C style. When the pattern matches the path in question, the attributes listed on the line are given to the path." onmousemove="i18n(this)">&Tcy;&ocy; &iecy;&scy;&tcy;&softcy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy;, &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy;, &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&jcy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&acy;&mcy;&icy;. &Vcy;&iecy;&dcy;&ucy;&shchcy;&icy;&iecy; &icy; &kcy;&ocy;&ncy;&iecy;&chcy;&ncy;&ycy;&iecy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&ycy; &icy;&gcy;&ncy;&ocy;&rcy;&icy;&rcy;&ucy;&yucy;&tcy;&scy;&yacy;. &Scy;&tcy;&rcy;&ocy;&kcy;&icy;, &ncy;&acy;&chcy;&icy;&ncy;&acy;&yucy;&shchcy;&icy;&iecy;&scy;&yacy; &scy;  <code>#</code> , &icy;&gcy;&ncy;&ocy;&rcy;&icy;&rcy;&ucy;&yucy;&tcy;&scy;&yacy;. &SHcy;&acy;&bcy;&lcy;&ocy;&ncy;&ycy;, &ncy;&acy;&chcy;&icy;&ncy;&acy;&yucy;&shchcy;&icy;&iecy;&scy;&yacy; &scy; &dcy;&vcy;&ocy;&jcy;&ncy;&ocy;&jcy; &kcy;&acy;&vcy;&ycy;&chcy;&kcy;&icy;, &tscy;&icy;&tcy;&icy;&rcy;&ucy;&yucy;&tcy;&scy;&yacy; &vcy; &scy;&tcy;&icy;&lcy;&iecy; C. &IEcy;&scy;&lcy;&icy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&iecy;&mcy;&ocy;&mcy;&ucy; &pcy;&ucy;&tcy;&icy;, &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;, &pcy;&iecy;&rcy;&iecy;&chcy;&icy;&scy;&lcy;&iecy;&ncy;&ncy;&ycy;&iecy; &vcy; &scy;&tcy;&rcy;&ocy;&kcy;&iecy;, &pcy;&rcy;&icy;&scy;&vcy;&acy;&icy;&vcy;&acy;&yucy;&tcy;&scy;&yacy; &ecy;&tcy;&ocy;&mcy;&ucy; &pcy;&ucy;&tcy;&icy;.</span></p> <p><span data-i18n="8067711a0b2f11a71246b8b447214fbc17f89071222fc1485070bd13d52a6bbe/58" data-source="Each attribute can be in one of these states for a given path:" onmousemove="i18n(this)">&Kcy;&acy;&zhcy;&dcy;&ycy;&jcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&softcy;&scy;&yacy; &vcy; &ocy;&dcy;&ncy;&ocy;&mcy; &icy;&zcy; &ecy;&tcy;&icy;&khcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&jcy; &dcy;&lcy;&yacy; &dcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &pcy;&ucy;&tcy;&icy;:</span></p> <div> <dl> <dt id="Documentation/gitattributes.txt-Set"><span data-i18n="b6f6f3ad07b3c05fa0bbbbf2e3d257ff1e3e31a83efbe2c9369cd008594f94e0/14" data-source="Set" onmousemove="i18n(this)">Set</span></dt> <dd> <p><span data-i18n="2cfcf2e44eaa57b5628a994d783530936cd814956cf526f2c64df12a1941527e/08" data-source="The path has the attribute with special value &amp;quot;true&amp;quot;; this is specified by listing only the name of the attribute in the attribute list." onmousemove="i18n(this)">&Pcy;&ucy;&tcy;&softcy; &icy;&mcy;&iecy;&iecy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &scy;&ocy; &scy;&pcy;&iecy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ycy;&mcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy;  &quot;true&quot; ; &ecy;&tcy;&ocy; &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &pcy;&ucy;&tcy;&iecy;&mcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yacy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &icy;&mcy;&iecy;&ncy;&icy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy; &vcy; &scy;&pcy;&icy;&scy;&kcy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unset"><span data-i18n="8d2dd4e8c7caa1acb407c161aad48d1201e93e0f6dcf54c8f19ae6fb3fd15127/b7" data-source="Unset" onmousemove="i18n(this)">Unset</span></dt> <dd> <p><span data-i18n="24aefd71c3171ab6024d614489ce09d7d048d30804424359f156acaf67cd332b/49" data-source="The path has the attribute with special value &amp;quot;false&amp;quot;; this is specified by listing the name of the attribute prefixed with a dash &lt;code&gt;-&lt;/code&gt; in the attribute list." onmousemove="i18n(this)">&Pcy;&ucy;&tcy;&softcy; &icy;&mcy;&iecy;&iecy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &scy;&ocy; &scy;&pcy;&iecy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ycy;&mcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy;  &quot;false&quot; ; &ecy;&tcy;&ocy; &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &pcy;&ucy;&tcy;&iecy;&mcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yacy; &icy;&mcy;&iecy;&ncy;&icy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy; &scy; &pcy;&rcy;&iecy;&fcy;&icy;&kcy;&scy;&ocy;&mcy; &tcy;&icy;&rcy;&iecy;  <code>-</code>  &vcy; &scy;&pcy;&icy;&scy;&kcy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Settoavalue"><span data-i18n="8253a27eb5d263a4c01d5b63acd6280234946956cde826e8a7ea362dd4a32586/8d" data-source="Set to a value" onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;</span></dt> <dd> <p><span data-i18n="2e1413784725ae9cf15c16aa23fdce10cfe52f1ccea7f256b84eb0b0bb4ac9de/35" data-source="The path has the attribute with specified string value; this is specified by listing the name of the attribute followed by an equal sign &lt;code&gt;=&lt;/code&gt; and its value in the attribute list." onmousemove="i18n(this)">&Pcy;&ucy;&tcy;&softcy; &icy;&mcy;&iecy;&iecy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &scy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ycy;&mcy; &scy;&tcy;&rcy;&ocy;&kcy;&ocy;&vcy;&ycy;&mcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy;; &ecy;&tcy;&ocy; &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &pcy;&ucy;&tcy;&iecy;&mcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&yacy; &icy;&mcy;&iecy;&ncy;&icy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;, &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &zcy;&ncy;&acy;&kcy; &rcy;&acy;&vcy;&iecy;&ncy;&scy;&tcy;&vcy;&acy;  <code>=</code> , &icy; &iecy;&gcy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &vcy; &scy;&pcy;&icy;&scy;&kcy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unspecified"><span data-i18n="5b8aa0bf3c59daec38e2d0c690a1a62513208d1e2075dad62a32ca0b9440b1a1/dd" data-source="Unspecified" onmousemove="i18n(this)">Unspecified</span></dt> <dd> <p><span data-i18n="111ee7709a1e7a65741a85d7385607e284faf2587bee95915c421550ab5ceec2/ac" data-source="No pattern matches the path, and nothing says if the path has or does not have the attribute, the attribute for the path is said to be Unspecified." onmousemove="i18n(this)">&Ncy;&icy; &ocy;&dcy;&icy;&ncy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy; &ncy;&iecy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &pcy;&ucy;&tcy;&icy;, &icy; &ncy;&icy;&chcy;&iecy;&gcy;&ocy; &ncy;&iecy; &gcy;&ocy;&vcy;&ocy;&rcy;&icy;&tcy; &ocy; &tcy;&ocy;&mcy;, &icy;&mcy;&iecy;&iecy;&tcy; &lcy;&icy; &pcy;&ucy;&tcy;&softcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &icy;&lcy;&icy; &ncy;&iecy;&tcy;, &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &pcy;&ucy;&tcy;&icy; &scy;&chcy;&icy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &ncy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&mcy;.</span></p> </dd> </dl> </div> <p><span data-i18n="c9d4d5c591871aaa1cc7fcd807cf42d55b317f914ca0702e229cd9073047bcee/e7" data-source="When more than one pattern matches the path, a later line overrides an earlier line. This overriding is done per attribute." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &pcy;&ucy;&tcy;&icy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &bcy;&ocy;&lcy;&iecy;&iecy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy;&acy;, &bcy;&ocy;&lcy;&iecy;&iecy; &pcy;&ocy;&zcy;&dcy;&ncy;&yacy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &bcy;&ocy;&lcy;&iecy;&iecy; &rcy;&acy;&ncy;&ncy;&yucy;&yucy;. &Ecy;&tcy;&ocy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&gcy;&ocy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;.</span></p> <p><span data-i18n="725d71e468a1c8cfa591f9b4fa7a302f0b37e9e4884287de02440a6b82f5d9a8/40" data-source="The rules by which the pattern matches paths are the same as in &lt;code&gt;.gitignore&lt;/code&gt; files (see &lt;a href=&quot;gitignore&quot;&gt;gitignore[5]&lt;/a&gt;), with a few exceptions:" onmousemove="i18n(this)">&Pcy;&rcy;&acy;&vcy;&icy;&lcy;&acy; &scy;&ocy;&pcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &pcy;&ucy;&tcy;&iecy;&jcy; &scy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy;&ocy;&mcy; &tcy;&acy;&kcy;&icy;&iecy; &zhcy;&iecy;, &kcy;&acy;&kcy; &icy; &vcy; &fcy;&acy;&jcy;&lcy;&acy;&khcy;  <code>.gitignore</code>  (&scy;&mcy;.  <a href="gitignore.html">gitignore[5]</a> ), &zcy;&acy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy;&icy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&yacy;&mcy;&icy;:</span></p> <div> <ul> <li> <p><span data-i18n="f8f729ee15896d746b6f53d507895dc735bcdf178fd57a1e586b87b116ff15c9/88" data-source="negative patterns are forbidden" onmousemove="i18n(this)">&ncy;&iecy;&gcy;&acy;&tcy;&icy;&vcy;&ncy;&ycy;&iecy; &mcy;&ocy;&dcy;&iecy;&lcy;&icy; &zcy;&acy;&pcy;&rcy;&iecy;&shchcy;&iecy;&ncy;&ycy;</span></p> </li> <li> <p><span data-i18n="282c8afba2be3727468a3c9fc4db9d6d7a664c84c7e506c0292fd982f7576280/8d" data-source="patterns that match a directory do not recursively match paths inside that directory (so using the trailing-slash &lt;code&gt;path/&lt;/code&gt; syntax is pointless in an attributes file; use &lt;code&gt;path/**&lt;/code&gt; instead)" onmousemove="i18n(this)">&shcy;&acy;&bcy;&lcy;&ocy;&ncy;&ycy;, &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&iecy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&ucy;, &ncy;&iecy; &scy;&ocy;&pcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&yucy;&tcy; &rcy;&iecy;&kcy;&ucy;&rcy;&scy;&icy;&vcy;&ncy;&ocy; &pcy;&ucy;&tcy;&icy; &vcy;&ncy;&ucy;&tcy;&rcy;&icy; &ecy;&tcy;&ocy;&gcy;&ocy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&acy; (&pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &scy;&icy;&ncy;&tcy;&acy;&kcy;&scy;&icy;&scy;&acy; &kcy;&ocy;&scy;&ocy;&jcy; &chcy;&iecy;&rcy;&tcy;&ycy;  <code>path/</code>  &vcy; &fcy;&acy;&jcy;&lcy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy; &bcy;&iecy;&scy;&scy;&mcy;&ycy;&scy;&lcy;&iecy;&ncy;&ncy;&ocy;; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ecy;&tcy;&ocy;&gcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <code>path/**</code> )</span></p> </li> </ul> </div> <p><span data-i18n="836f6fabaf29c541bb1a3e550f95a2f293cedc023d2cf0d809cbe58f8d8aba89/86" data-source="When deciding what attributes are assigned to a path, Git consults &lt;code&gt;$GIT_DIR/info/attributes&lt;/code&gt; file (which has the highest precedence), &lt;code&gt;.gitattributes&lt;/code&gt; file in the same directory as the path in question, and its parent directories up to the toplevel of the work tree (the further the directory that contains &lt;code&gt;.gitattributes&lt;/code&gt; is from the path in question, the lower its precedence). Finally global and system-wide files are considered (they have the lowest precedence)." onmousemove="i18n(this)">&Pcy;&rcy;&icy; &pcy;&rcy;&icy;&ncy;&yacy;&tcy;&icy;&icy; &rcy;&iecy;&shcy;&iecy;&ncy;&icy;&yacy; &ocy; &tcy;&ocy;&mcy;, &kcy;&acy;&kcy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy; &pcy;&rcy;&icy;&scy;&vcy;&ocy;&iecy;&ncy;&ycy; &pcy;&ucy;&tcy;&icy;,  Git  &ocy;&bcy;&rcy;&acy;&shchcy;&acy;&iecy;&tcy;&scy;&yacy; &kcy; &fcy;&acy;&jcy;&lcy;&ucy;  <code>$GIT_DIR/info/attributes</code>  (&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &icy;&mcy;&iecy;&iecy;&tcy; &ncy;&acy;&icy;&vcy;&ycy;&scy;&shcy;&icy;&jcy; &pcy;&rcy;&icy;&ocy;&rcy;&icy;&tcy;&iecy;&tcy;), &fcy;&acy;&jcy;&lcy;&ucy;  <code>.gitattributes</code>  &vcy; &tcy;&ocy;&mcy; &zhcy;&iecy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy;, &chcy;&tcy;&ocy; &icy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&iecy;&mcy;&ycy;&jcy; &pcy;&ucy;&tcy;&softcy;, &icy; &iecy;&gcy;&ocy; &rcy;&ocy;&dcy;&icy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&acy;&mcy; &vcy;&pcy;&lcy;&ocy;&tcy;&softcy; &dcy;&ocy; &vcy;&iecy;&rcy;&khcy;&ncy;&iecy;&gcy;&ocy; &ucy;&rcy;&ocy;&vcy;&ncy;&yacy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; (&chcy;&iecy;&mcy; &dcy;&acy;&lcy;&softcy;&shcy;&iecy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&icy;&jcy;  <code>.gitattributes</code> , &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &pcy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&mcy;&ucy; &pcy;&ucy;&tcy;&icy;, &tcy;&iecy;&mcy; &ncy;&icy;&zhcy;&iecy; &iecy;&gcy;&ocy; &pcy;&rcy;&icy;&ocy;&rcy;&icy;&tcy;&iecy;&tcy;). &Ncy;&acy;&kcy;&ocy;&ncy;&iecy;&tscy;, &ucy;&chcy;&icy;&tcy;&ycy;&vcy;&acy;&yucy;&tcy;&scy;&yacy; &gcy;&lcy;&ocy;&bcy;&acy;&lcy;&softcy;&ncy;&ycy;&iecy; &icy; &ocy;&bcy;&shchcy;&iecy;&scy;&icy;&scy;&tcy;&iecy;&mcy;&ncy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; (&ocy;&ncy;&icy; &icy;&mcy;&iecy;&yucy;&tcy; &scy;&acy;&mcy;&ycy;&jcy; &ncy;&icy;&zcy;&kcy;&icy;&jcy; &pcy;&rcy;&icy;&ocy;&rcy;&icy;&tcy;&iecy;&tcy;).</span></p> <p><span data-i18n="a4f9a453a934a279d925f26f26ed47ef94456dd81b6e80d3c25fb0cb391461e7/87" data-source="When the &lt;code&gt;.gitattributes&lt;/code&gt; file is missing from the work tree, the path in the index is used as a fall-back. During checkout process, &lt;code&gt;.gitattributes&lt;/code&gt; in the index is used and then the file in the working tree is used as a fall-back." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &fcy;&acy;&jcy;&lcy;  <code>.gitattributes</code>  &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;, &pcy;&ucy;&tcy;&softcy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &zcy;&acy;&pcy;&acy;&scy;&ncy;&ocy;&jcy; &vcy;&acy;&rcy;&icy;&acy;&ncy;&tcy;. &Vcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy;&iecy; &ocy;&fcy;&ocy;&rcy;&mcy;&lcy;&iecy;&ncy;&icy;&yacy; &zcy;&acy;&kcy;&acy;&zcy;&acy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;  <code>.gitattributes</code> , &acy; &zcy;&acy;&tcy;&iecy;&mcy; &fcy;&acy;&jcy;&lcy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &rcy;&iecy;&zcy;&iecy;&rcy;&vcy;&ncy;&ocy;&gcy;&ocy; &vcy;&acy;&rcy;&icy;&acy;&ncy;&tcy;&acy;.</span></p> <p><span data-i18n="ec51e122a0cfc8574ea63cfe978af0491e3a66685ff4b791c3f9239cc653a7b5/9b" data-source="If you wish to affect only a single repository (i.e., to assign attributes to files that are particular to one user&amp;rsquo;s workflow for that repository), then attributes should be placed in the &lt;code&gt;$GIT_DIR/info/attributes&lt;/code&gt; file. Attributes which should be version-controlled and distributed to other repositories (i.e., attributes of interest to all users) should go into &lt;code&gt;.gitattributes&lt;/code&gt; files. Attributes that should affect all repositories for a single user should be placed in a file specified by the &lt;code&gt;core.attributesFile&lt;/code&gt; configuration option (see &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt;). Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/attributes is used instead. Attributes for all users on a system should be placed in the &lt;code&gt;$(prefix)/etc/gitattributes&lt;/code&gt; file." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &pcy;&ocy;&vcy;&lcy;&icy;&yacy;&tcy;&softcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &ncy;&acy; &ocy;&dcy;&icy;&ncy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&jcy; (&tcy;. &iecy;. &ncy;&acy;&zcy;&ncy;&acy;&chcy;&icy;&tcy;&softcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy; &fcy;&acy;&jcy;&lcy;&acy;&mcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ocy;&tcy;&ncy;&ocy;&scy;&yacy;&tcy;&scy;&yacy; &kcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy;&ucy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy;&ucy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yacy; &vcy; &ecy;&tcy;&ocy;&mcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy;), &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &pcy;&ocy;&mcy;&iecy;&scy;&tcy;&icy;&tcy;&softcy; &vcy; &fcy;&acy;&jcy;&lcy;  <code>$GIT_DIR/info/attributes</code> . &Acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &kcy;&ocy;&ncy;&tcy;&rcy;&ocy;&lcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;&mcy;&icy; &icy; &rcy;&acy;&scy;&pcy;&rcy;&ocy;&scy;&tcy;&rcy;&acy;&ncy;&yacy;&tcy;&softcy;&scy;&yacy; &vcy; &dcy;&rcy;&ucy;&gcy;&icy;&iecy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy; (&tcy;. &iecy;. &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;, &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&yucy;&shchcy;&icy;&iecy; &icy;&ncy;&tcy;&iecy;&rcy;&iecy;&scy; &dcy;&lcy;&yacy; &vcy;&scy;&iecy;&khcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&iecy;&jcy;), &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &pcy;&ocy;&mcy;&iecy;&shchcy;&acy;&tcy;&softcy;&scy;&yacy; &vcy; &fcy;&acy;&jcy;&lcy;&ycy;  <code>.gitattributes</code> . &Acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &vcy;&lcy;&icy;&yacy;&tcy;&softcy; &ncy;&acy; &vcy;&scy;&iecy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy; &dcy;&lcy;&yacy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yacy;, &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &bcy;&ycy;&tcy;&softcy; &pcy;&ocy;&mcy;&iecy;&shchcy;&iecy;&ncy;&ycy; &vcy; &fcy;&acy;&jcy;&lcy;, &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ycy;&jcy; &vcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&iecy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>core.attributesFile</code>  (&scy;&mcy;.  <a href="git-config.html">git-config[1]</a> ). &IEcy;&gcy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &mdash; $XDG_CONFIG_HOME/git/attributes. &IEcy;&scy;&lcy;&icy; $XDG_CONFIG_HOME &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &icy;&lcy;&icy; &pcy;&ucy;&scy;&tcy;, &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ncy;&iecy;&gcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; $HOME/.config/git/attributes. &Acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy; &vcy;&scy;&iecy;&khcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&iecy;&jcy; &scy;&icy;&scy;&tcy;&iecy;&mcy;&ycy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &bcy;&ycy;&tcy;&softcy; &pcy;&ocy;&mcy;&iecy;&shchcy;&iecy;&ncy;&ycy; &vcy; &fcy;&acy;&jcy;&lcy;  <code>$(prefix)/etc/gitattributes</code> .</span></p> <p><span data-i18n="34cc3b147f77e092417fc06e346bff921f33ff17d34269e8f9f4f1ee7401d3e0/f1" data-source="Sometimes you would need to override a setting of an attribute for a path to &lt;code&gt;Unspecified&lt;/code&gt; state. This can be done by listing the name of the attribute prefixed with an exclamation point &lt;code&gt;!&lt;/code&gt;." onmousemove="i18n(this)">&Icy;&ncy;&ocy;&gcy;&dcy;&acy; &vcy;&acy;&mcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&ocy;&tcy;&rcy;&iecy;&bcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&jcy;&kcy;&ucy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy; &pcy;&ucy;&tcy;&icy; &kcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&yucy;  <code>Unspecified</code> . &Ecy;&tcy;&ocy; &mcy;&ocy;&zhcy;&ncy;&ocy; &scy;&dcy;&iecy;&lcy;&acy;&tcy;&softcy;, &ucy;&kcy;&acy;&zcy;&acy;&vcy; &icy;&mcy;&yacy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy; &scy; &pcy;&rcy;&iecy;&fcy;&icy;&kcy;&scy;&ocy;&mcy; &vcy;&ocy;&scy;&kcy;&lcy;&icy;&tscy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &zcy;&ncy;&acy;&kcy;&acy;  <code>!</code> .</span></p> </div> <h2 class="text-body-emphasis"  id="_effects"><span data-i18n="358511c8c09805c9c10b1ba11157ed0c08ced8599d59e27e16fa226bdc32d63e/1b" data-source="Effects" onmousemove="i18n(this)">Effects</span></h2> <div> <p><span data-i18n="5e82cbc3570bde09e37404f772614e61216aa3daaa0336b0722d07af947ba40d/ba" data-source="Certain operations by Git can be influenced by assigning particular attributes to a path. Currently, the following operations are attributes-aware." onmousemove="i18n(this)">&Ncy;&acy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&icy;  Git  &mcy;&ocy;&zhcy;&ncy;&ocy; &vcy;&lcy;&icy;&yacy;&tcy;&softcy; &pcy;&ucy;&tcy;&iecy;&mcy; &ncy;&acy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&khcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy; &pcy;&ucy;&tcy;&icy;. &Vcy; &ncy;&acy;&scy;&tcy;&ocy;&yacy;&shchcy;&iecy;&iecy; &vcy;&rcy;&iecy;&mcy;&yacy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&iecy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&icy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&yucy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;.</span></p> <div> <h3 class="text-body-emphasis"  id="_checking_out_and_checking_in"><span data-i18n="0d26ba5e19d21f445eddb3199558281fb70a857043b2b1124a865ee12f67337d/b8" data-source="Checking-out and checking-in" onmousemove="i18n(this)">&Vcy;&ycy;&iecy;&zcy;&dcy; &icy; &zcy;&acy;&iecy;&zcy;&dcy;</span></h3> <p><span data-i18n="79de5b043929aa9a5a669c983a5fc66ad7d98afb9e4b23d9ad7be014fee419ce/4c" data-source="These attributes affect how the contents stored in the repository are copied to the working tree files when commands such as &lt;code&gt;git switch&lt;/code&gt;, &lt;code&gt;git checkout&lt;/code&gt; and &lt;code&gt;git merge&lt;/code&gt; run. They also affect how Git stores the contents you prepare in the working tree in the repository upon &lt;code&gt;git add&lt;/code&gt; and &lt;code&gt;git commit&lt;/code&gt;." onmousemove="i18n(this)">&Ecy;&tcy;&icy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy; &vcy;&lcy;&icy;&yacy;&yucy;&tcy; &ncy;&acy; &tcy;&ocy;, &kcy;&acy;&kcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy;, &khcy;&rcy;&acy;&ncy;&yacy;&shchcy;&iecy;&iecy;&scy;&yacy; &vcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy;, &kcy;&ocy;&pcy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy; &vcy; &fcy;&acy;&jcy;&lcy;&ycy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &pcy;&rcy;&icy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&iecy; &tcy;&acy;&kcy;&icy;&khcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;, &kcy;&acy;&kcy;  <code>git switch</code> ,  <code>git checkout</code>  &icy;  <code>git merge</code> . &Ocy;&ncy;&icy; &tcy;&acy;&kcy;&zhcy;&iecy; &vcy;&lcy;&icy;&yacy;&yucy;&tcy; &ncy;&acy; &tcy;&ocy;, &kcy;&acy;&kcy;  Git  &scy;&ocy;&khcy;&rcy;&acy;&ncy;&yacy;&iecy;&tcy; &pcy;&ocy;&dcy;&gcy;&ocy;&tcy;&ocy;&vcy;&lcy;&iecy;&ncy;&ncy;&ocy;&iecy; &vcy;&acy;&mcy;&icy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&yacy; &ncy;&acy;  <code>git add</code>  &icy;  <code>git commit</code> .</span></p> <div> <h4 class="text-body-emphasis"  id="_text">
<code>text</code>
</h4> <p><span data-i18n="38232736f77ec03ae18af7649fb19139ff8446ec52a56abb815f46cc3d992c53/00" data-source="This attribute marks the path as a text file, which enables end-of-line conversion: When a matching file is added to the index, the file&amp;rsquo;s line endings are normalized to LF in the index. Conversely, when the file is copied from the index to the working directory, its line endings may be converted from LF to CRLF depending on the &lt;code&gt;eol&lt;/code&gt; attribute, the Git config, and the platform (see explanation of &lt;code&gt;eol&lt;/code&gt; below)." onmousemove="i18n(this)">&Ecy;&tcy;&ocy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &pcy;&ocy;&mcy;&iecy;&chcy;&acy;&iecy;&tcy; &pcy;&ucy;&tcy;&softcy; &kcy;&acy;&kcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy;, &chcy;&tcy;&ocy; &ocy;&bcy;&iecy;&scy;&pcy;&iecy;&chcy;&icy;&vcy;&acy;&iecy;&tcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &kcy;&ocy;&ncy;&tscy;&acy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;: &kcy;&ocy;&gcy;&dcy;&acy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&jcy; &fcy;&acy;&jcy;&lcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;, &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy; &fcy;&acy;&jcy;&lcy;&acy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&ucy;&yucy;&tcy;&scy;&yacy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&iecy; &dcy;&ocy; LF. &Icy; &ncy;&acy;&ocy;&bcy;&ocy;&rcy;&ocy;&tcy;, &kcy;&ocy;&gcy;&dcy;&acy; &fcy;&acy;&jcy;&lcy; &kcy;&ocy;&pcy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy; &icy;&zcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&acy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&icy;&jcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;, &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &iecy;&gcy;&ocy; &scy;&tcy;&rcy;&ocy;&kcy; &mcy;&ocy;&gcy;&ucy;&tcy; &bcy;&ycy;&tcy;&softcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&ycy; &icy;&zcy; LF &vcy; CRLF &vcy; &zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &ocy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;  <code>eol</code> , &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  Git  &icy; &pcy;&lcy;&acy;&tcy;&fcy;&ocy;&rcy;&mcy;&ycy; (&scy;&mcy;. &ocy;&bcy;&hardcy;&yacy;&scy;&ncy;&iecy;&ncy;&icy;&iecy;  <code>eol</code>  &ncy;&icy;&zhcy;&iecy;).</span></p> <div> <dl> <dt id="Documentation/gitattributes.txt-Set-1"><span data-i18n="b6f6f3ad07b3c05fa0bbbbf2e3d257ff1e3e31a83efbe2c9369cd008594f94e0/14" data-source="Set" onmousemove="i18n(this)">Set</span></dt> <dd> <p><span data-i18n="32887044707b7611aa9f9cfaca20960b02d491e613249b66b478f943ba958691/58" data-source="Setting the &lt;code&gt;text&lt;/code&gt; attribute on a path enables end-of-line conversion on checkin and checkout as described above. Line endings are normalized to LF in the index every time the file is checked in, even if the file was previously added to Git with CRLF line endings." onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&kcy;&acy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;  <code>text</code>  &vcy; &pcy;&ucy;&tcy;&icy; &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&iecy;&tcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &kcy;&ocy;&ncy;&tscy;&acy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &pcy;&rcy;&icy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy;&iecy; &icy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&icy;&icy;, &kcy;&acy;&kcy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&ocy; &vcy;&ycy;&shcy;&iecy;. &Ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&ucy;&yucy;&tcy;&scy;&yacy; &dcy;&ocy; LF &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&iecy; &kcy;&acy;&zhcy;&dcy;&ycy;&jcy; &rcy;&acy;&zcy;, &kcy;&ocy;&gcy;&dcy;&acy; &fcy;&acy;&jcy;&lcy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&shchcy;&acy;&iecy;&tcy;&scy;&yacy;, &dcy;&acy;&zhcy;&iecy; &iecy;&scy;&lcy;&icy; &fcy;&acy;&jcy;&lcy; &rcy;&acy;&ncy;&iecy;&iecy; &bcy;&ycy;&lcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy; &vcy;  Git  &scy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy;&mcy;&icy; &scy;&tcy;&rcy;&ocy;&kcy; CRLF.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unset-1"><span data-i18n="8d2dd4e8c7caa1acb407c161aad48d1201e93e0f6dcf54c8f19ae6fb3fd15127/b7" data-source="Unset" onmousemove="i18n(this)">Unset</span></dt> <dd> <p><span data-i18n="1a0f1d866f3c28e0fbf9bf31979a4209af07b31cb95d4f09323a1f41d37c9e46/6a" data-source="Unsetting the &lt;code&gt;text&lt;/code&gt; attribute on a path tells Git not to attempt any end-of-line conversion upon checkin or checkout." onmousemove="i18n(this)">&Ucy;&dcy;&acy;&lcy;&iecy;&ncy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;  <code>text</code>  &dcy;&lcy;&yacy; &pcy;&ucy;&tcy;&icy; &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;  Git  &ncy;&iecy; &pcy;&ycy;&tcy;&acy;&tcy;&softcy;&scy;&yacy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&softcy; &kcy;&acy;&kcy;&ocy;&iecy;-&lcy;&icy;&bcy;&ocy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &kcy;&ocy;&ncy;&tscy;&acy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &pcy;&rcy;&icy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy;&iecy; &icy;&lcy;&icy; &ocy;&fcy;&ocy;&rcy;&mcy;&lcy;&iecy;&ncy;&icy;&icy; &zcy;&acy;&kcy;&acy;&zcy;&acy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Settostringvalueauto"><span data-i18n="5186fde3b8b78378b96e1f941a167a43ce00e92cffe60b9ec3c8489a91953fb6/c7" data-source="Set to string value &amp;quot;auto&amp;quot;" onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &scy;&tcy;&rcy;&ocy;&kcy;&ocy;&vcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;auto&quot; .</span></dt> <dd> <p><span data-i18n="0a4c5ce6fe7d99b78a60cd017561f8498e4bd1a02f9b9b950c877d3594750ed5/5d" data-source="When &lt;code&gt;text&lt;/code&gt; is set to &amp;quot;auto&amp;quot;, Git decides by itself whether the file is text or binary. If it is text and the file was not already in Git with CRLF endings, line endings are converted on checkin and checkout as described above. Otherwise, no conversion is done on checkin or checkout." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &dcy;&lcy;&yacy;  <code>text</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;auto&quot; ,  Git  &scy;&acy;&mcy;&ocy;&scy;&tcy;&ocy;&yacy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &rcy;&iecy;&shcy;&acy;&iecy;&tcy;, &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &lcy;&icy; &fcy;&acy;&jcy;&lcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&mcy; &icy;&lcy;&icy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&mcy;. &IEcy;&scy;&lcy;&icy; &ecy;&tcy;&ocy; &tcy;&iecy;&kcy;&scy;&tcy; &icy; &fcy;&acy;&jcy;&lcy; &iecy;&shchcy;&iecy; &ncy;&iecy; &bcy;&ycy;&lcy; &vcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&iecy;  Git  &scy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy;&mcy;&icy; CRLF, &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ucy;&yucy;&tcy;&scy;&yacy; &pcy;&rcy;&icy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy;&iecy; &icy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&icy;&icy;, &kcy;&acy;&kcy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&ocy; &vcy;&ycy;&shcy;&iecy;. &Vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &kcy;&ocy;&ncy;&vcy;&iecy;&rcy;&tcy;&acy;&tscy;&icy;&yacy; &pcy;&rcy;&icy; &rcy;&iecy;&gcy;&icy;&scy;&tcy;&rcy;&acy;&tscy;&icy;&icy; &icy;&lcy;&icy; &ocy;&fcy;&ocy;&rcy;&mcy;&lcy;&iecy;&ncy;&icy;&icy; &zcy;&acy;&kcy;&acy;&zcy;&acy; &ncy;&iecy; &pcy;&rcy;&ocy;&icy;&zcy;&vcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unspecified-1"><span data-i18n="5b8aa0bf3c59daec38e2d0c690a1a62513208d1e2075dad62a32ca0b9440b1a1/dd" data-source="Unspecified" onmousemove="i18n(this)">Unspecified</span></dt> <dd> <p><span data-i18n="607c491fdbc8683fcbd06f68c8a0b86e6114be2f2a425312b38896a405281930/40" data-source="If the &lt;code&gt;text&lt;/code&gt; attribute is unspecified, Git uses the &lt;code&gt;core.autocrlf&lt;/code&gt; configuration variable to determine if the file should be converted." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>text</code>  &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;,  Git  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>core.autocrlf</code> , &chcy;&tcy;&ocy;&bcy;&ycy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy;, &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &lcy;&icy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &fcy;&acy;&jcy;&lcy;.</span></p> </dd> </dl> </div> <p><span data-i18n="3844e86fa1d9470c1482e26da1dd11fc8b64bc2f7873d6f68b605ce7f1140528/45" data-source="Any other value causes Git to act as if &lt;code&gt;text&lt;/code&gt; has been left unspecified." onmousemove="i18n(this)">&Lcy;&yucy;&bcy;&ocy;&iecy; &dcy;&rcy;&ucy;&gcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy; &tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy;  Git  &bcy;&ucy;&dcy;&iecy;&tcy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&tcy;&softcy; &tcy;&acy;&kcy;, &kcy;&acy;&kcy; &iecy;&scy;&lcy;&icy; &bcy;&ycy;  <code>text</code>  &ncy;&iecy; &bcy;&ycy;&lcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;.</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_eol">
<code>eol</code>
</h4> <p><span data-i18n="48532a6b03139501960894655c37374cc087d9d2304318f793ed31e5f4f9464d/33" data-source="This attribute marks a path to use a specific line-ending style in the working tree when it is checked out. It has effect only if &lt;code&gt;text&lt;/code&gt; or &lt;code&gt;text=auto&lt;/code&gt; is set (see above), but specifying &lt;code&gt;eol&lt;/code&gt; automatically sets &lt;code&gt;text&lt;/code&gt; if &lt;code&gt;text&lt;/code&gt; was left unspecified." onmousemove="i18n(this)">&Ecy;&tcy;&ocy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &ocy;&tcy;&mcy;&iecy;&chcy;&acy;&iecy;&tcy; &pcy;&ucy;&tcy;&softcy; &dcy;&lcy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ocy;&gcy;&ocy; &scy;&tcy;&icy;&lcy;&yacy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy; &pcy;&rcy;&icy; &iecy;&gcy;&ocy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&icy;&icy;. &Ecy;&tcy;&ocy; &icy;&mcy;&iecy;&iecy;&tcy; &ecy;&fcy;&fcy;&iecy;&kcy;&tcy;, &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &iecy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;  <code>text</code>  &icy;&lcy;&icy;  <code>text=auto</code>  (&scy;&mcy;. &vcy;&ycy;&shcy;&iecy;), &ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&icy;&iecy;  <code>eol</code>  &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&acy;&vcy;&lcy;&icy;&vcy;&acy;&iecy;&tcy;  <code>text</code> , &iecy;&scy;&lcy;&icy;  <code>text</code>  &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;.</span></p> <div> <dl> <dt id="Documentation/gitattributes.txt-Settostringvaluecrlf"><span data-i18n="1572756e6e69c705d303b7fe5d70da6e109eb66432600860340caf451843f59f/67" data-source="Set to string value &amp;quot;crlf&amp;quot;" onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &scy;&tcy;&rcy;&ocy;&kcy;&ocy;&vcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;crlf&quot; .</span></dt> <dd> <p><span data-i18n="6e9c994630eaedcaa24038ef99f414d51cbc75f5d9817f42d844853a4ea98be5/ff" data-source="This setting converts the file&amp;rsquo;s line endings in the working directory to CRLF when the file is checked out." onmousemove="i18n(this)">&Ecy;&tcy;&ocy;&tcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ucy;&iecy;&tcy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy; &fcy;&acy;&jcy;&lcy;&acy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy; &vcy; CRLF &pcy;&rcy;&icy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&icy;&icy; &fcy;&acy;&jcy;&lcy;&acy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Settostringvaluelf"><span data-i18n="0e38472ee38c315f7c5bea8f1255015c878af1812ba88a3c7e98a8dab4254c63/f6" data-source="Set to string value &amp;quot;lf&amp;quot;" onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &scy;&tcy;&rcy;&ocy;&kcy;&ocy;&vcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;lf&quot; .</span></dt> <dd> <p><span data-i18n="6d0305f803a4d0e6dd42e122438159bde500a8f49a42110a0dff253e470be05d/8e" data-source="This setting uses the same line endings in the working directory as in the index when the file is checked out." onmousemove="i18n(this)">&Ecy;&tcy;&ocy;&tcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &tcy;&iecy; &zhcy;&iecy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy;, &chcy;&tcy;&ocy; &icy; &vcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&iecy; &pcy;&rcy;&icy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&icy;&icy; &fcy;&acy;&jcy;&lcy;&acy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unspecified-1-1"><span data-i18n="5b8aa0bf3c59daec38e2d0c690a1a62513208d1e2075dad62a32ca0b9440b1a1/dd" data-source="Unspecified" onmousemove="i18n(this)">Unspecified</span></dt> <dd> <p><span data-i18n="ed51d339fc0f5525d9285b0908b1c626f9a3dee8676fe34c695fb6686f0c47e1/0c" data-source="If the &lt;code&gt;eol&lt;/code&gt; attribute is unspecified for a file, its line endings in the working directory are determined by the &lt;code&gt;core.autocrlf&lt;/code&gt; or &lt;code&gt;core.eol&lt;/code&gt; configuration variable (see the definitions of those options in &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt;). If &lt;code&gt;text&lt;/code&gt; is set but neither of those variables is, the default is &lt;code&gt;eol=crlf&lt;/code&gt; on Windows and &lt;code&gt;eol=lf&lt;/code&gt; on all other platforms." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>eol</code>  &dcy;&lcy;&yacy; &fcy;&acy;&jcy;&lcy;&acy; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;, &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &iecy;&gcy;&ocy; &scy;&tcy;&rcy;&ocy;&kcy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>core.autocrlf</code>  &icy;&lcy;&icy;  <code>core.eol</code>  (&scy;&mcy;. &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &ecy;&tcy;&icy;&khcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ocy;&vcy; &vcy;  <a href="git-config.html">git-config[1]</a> ). &IEcy;&scy;&lcy;&icy;  <code>text</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;, &ncy;&ocy; &ncy;&icy; &ocy;&dcy;&ncy;&acy; &icy;&zcy; &ecy;&tcy;&icy;&khcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&khcy; &ncy;&iecy; &zcy;&acy;&dcy;&acy;&ncy;&acy;, &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy;  <code>eol=crlf</code>  &vcy; Windows &icy;  <code>eol=lf</code>  &ncy;&acy; &vcy;&scy;&iecy;&khcy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &pcy;&lcy;&acy;&tcy;&fcy;&ocy;&rcy;&mcy;&acy;&khcy;.</span></p> </dd> </dl> </div> </div> <div> <h4 class="text-body-emphasis"  id="_backwards_compatibility_with_crlf_attribute"><span data-i18n="1aac85a2c42c3ae3659b4b1810d9ae398568ca2443e0da5c15a6a93377bc107d/da" data-source="Backwards compatibility with &lt;code&gt;crlf&lt;/code&gt; attribute" onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&ncy;&acy;&yacy; &scy;&ocy;&vcy;&mcy;&iecy;&scy;&tcy;&icy;&mcy;&ocy;&scy;&tcy;&softcy; &scy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&mcy;  <code>crlf</code> .</span></h4> <p><span data-i18n="f24bd4504eb269775180fd081daae85e157b158945dbad8f00911b0d90278457/42" data-source="For backwards compatibility, the &lt;code&gt;crlf&lt;/code&gt; attribute is interpreted as follows:" onmousemove="i18n(this)">&Dcy;&lcy;&yacy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy;&jcy; &scy;&ocy;&vcy;&mcy;&iecy;&scy;&tcy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>crlf</code>  &icy;&ncy;&tcy;&iecy;&rcy;&pcy;&rcy;&iecy;&tcy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;:</span></p> <div> <div> <pre class="hljs language-vbnet">crlf                <span class="hljs-keyword">text</span>
-crlf                -<span class="hljs-keyword">text</span>
crlf=input        eol=lf</pre> </div> </div> </div> <div> <h4 class="text-body-emphasis"  id="_end_of_line_conversion"><span data-i18n="4d8ed58b1314dd4aa0fadbf9061deadc00b7a5d5aa259c6afd104e53d9879488/b1" data-source="End-of-line conversion" onmousemove="i18n(this)">End-of-line conversion</span></h4> <p><span data-i18n="00fe6671cd2569d5d782e5cf5c8400e2e140dda76e62f01ec1eeb56c04ddf56b/e5" data-source="While Git normally leaves file contents alone, it can be configured to normalize line endings to LF in the repository and, optionally, to convert them to CRLF when files are checked out." onmousemove="i18n(this)">&KHcy;&ocy;&tcy;&yacy;  Git  &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &fcy;&acy;&jcy;&lcy;&acy; &bcy;&iecy;&zcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy;, &iecy;&gcy;&ocy; &mcy;&ocy;&zhcy;&ncy;&ocy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&icy;&tcy;&softcy; &ncy;&acy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&acy;&tscy;&icy;&yucy; &kcy;&ocy;&ncy;&tscy;&ocy;&vcy; &scy;&tcy;&rcy;&ocy;&kcy; &vcy; LF &vcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy; &icy;, &pcy;&rcy;&icy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy;&scy;&tcy;&icy;, &ncy;&acy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &icy;&khcy; &vcy; CRLF &pcy;&rcy;&icy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&icy;&icy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;.</span></p> <p><span data-i18n="d55066c3fcf43dd682aca884a4078128f3b6e5ae7007bedff7c56eac92087dae/6d" data-source="If you simply want to have CRLF line endings in your working directory regardless of the repository you are working with, you can set the config variable &amp;quot;core.autocrlf&amp;quot; without using any attributes." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy;, &chcy;&tcy;&ocy;&bcy;&ycy; &vcy; &vcy;&acy;&shcy;&iecy;&mcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy; &zcy;&acy;&kcy;&acy;&ncy;&chcy;&icy;&vcy;&acy;&lcy;&icy;&scy;&softcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; CRLF &ncy;&iecy;&zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy; &ocy;&tcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&yacy;, &scy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &vcy;&ycy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&iecy;&tcy;&iecy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  &quot;core.autocrlf&quot;  &bcy;&iecy;&zcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &kcy;&acy;&kcy;&icy;&khcy;-&lcy;&icy;&bcy;&ocy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy;.</span></p> <div> <div> <pre class="hljs language-ini"><span class="hljs-section">[core]</span>
        <span class="hljs-attr">autocrlf</span> = <span class="hljs-literal">true</span></pre> </div> </div> <p><span data-i18n="906146722a75d4196d884d4ee6067559e8caf8c2e012a1c9a3b9ee2e200fd864/7e" data-source="This does not force normalization of text files, but does ensure that text files that you introduce to the repository have their line endings normalized to LF when they are added, and that files that are already normalized in the repository stay normalized." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &ncy;&iecy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy; &pcy;&rcy;&icy;&ncy;&ucy;&dcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&jcy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&acy;&tscy;&icy;&icy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &ncy;&ocy; &gcy;&acy;&rcy;&acy;&ncy;&tcy;&icy;&rcy;&ucy;&iecy;&tcy;, &chcy;&tcy;&ocy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &vcy;&ycy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy;&iecy; &vcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&jcy;, &icy;&mcy;&iecy;&yucy;&tcy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;, &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &dcy;&ocy; LF &pcy;&rcy;&icy; &icy;&khcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&icy;, &icy; &chcy;&tcy;&ocy; &fcy;&acy;&jcy;&lcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ucy;&zhcy;&iecy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&ocy;&vcy;&acy;&ncy;&ycy; &vcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy;, &ocy;&scy;&tcy;&acy;&yucy;&tcy;&scy;&yacy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&mcy;&icy;.</span></p> <p><span data-i18n="c4dc8f82299e170e6892b8967dd572b7876c6861efc0b8580d9e508eebe5e1c2/f4" data-source="If you want to ensure that text files that any contributor introduces to the repository have their line endings normalized, you can set the &lt;code&gt;text&lt;/code&gt; attribute to &amp;quot;auto&amp;quot; for &lt;code&gt;all&lt;/code&gt; files." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &gcy;&acy;&rcy;&acy;&ncy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;, &chcy;&tcy;&ocy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &lcy;&yucy;&bcy;&ocy;&jcy; &ucy;&chcy;&acy;&scy;&tcy;&ncy;&icy;&kcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &vcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&jcy;, &icy;&mcy;&iecy;&yucy;&tcy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &dcy;&lcy;&yacy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;  <code>text</code>  &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;auto&quot;  &dcy;&lcy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;  <code>all</code> .</span></p> <div> <div> <pre class="hljs language-vbnet">*        <span class="hljs-keyword">text</span>=<span class="hljs-keyword">auto</span></pre> </div> </div> <p><span data-i18n="7d5e4eac5c42c60a83b9e83461def5231f805646494a4477e3db02f951db8aa2/3e" data-source="The attributes allow a fine-grained control, how the line endings are converted. Here is an example that will make Git normalize .txt, .vcproj and .sh files, ensure that .vcproj files have CRLF and .sh files have LF in the working directory, and prevent .jpg files from being normalized regardless of their content." onmousemove="i18n(this)">&Acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy; &pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&yucy;&tcy; &dcy;&iecy;&tcy;&acy;&lcy;&softcy;&ncy;&ocy; &kcy;&ocy;&ncy;&tcy;&rcy;&ocy;&lcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &kcy;&ocy;&ncy;&tscy;&ocy;&vcy; &scy;&tcy;&rcy;&ocy;&kcy;. &Vcy;&ocy;&tcy; &pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &zcy;&acy;&scy;&tcy;&acy;&vcy;&icy;&tcy;  Git  &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &fcy;&acy;&jcy;&lcy;&ycy; .txt, .vcproj &icy; .sh, &gcy;&acy;&rcy;&acy;&ncy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;, &chcy;&tcy;&ocy; &fcy;&acy;&jcy;&lcy;&ycy; .vcproj &icy;&mcy;&iecy;&yucy;&tcy; CRLF, &acy; &fcy;&acy;&jcy;&lcy;&ycy; .sh &icy;&mcy;&iecy;&yucy;&tcy; LF &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy;, &icy; &pcy;&rcy;&iecy;&dcy;&ocy;&tcy;&vcy;&rcy;&acy;&tcy;&icy;&tcy;&softcy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&acy;&tscy;&icy;&yucy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; .jpg &ncy;&iecy;&zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy; &ocy;&tcy; &icy;&khcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy;.</span></p> <div> <div> <pre class="hljs language-vbnet">*               <span class="hljs-keyword">text</span>=<span class="hljs-keyword">auto</span>
*.txt                <span class="hljs-keyword">text</span>
*.vcproj        <span class="hljs-keyword">text</span> eol=crlf
*.sh                <span class="hljs-keyword">text</span> eol=lf
*.jpg                -<span class="hljs-keyword">text</span></pre> </div> </div> <div> <div class="table-responsive"><table class="table"> <tr> <td> <div><span data-i18n="d8da2c49df39d91df7ecd199b92da7bf264f026242ccc69b08daeadfe587c45b/a2" data-source="Note" onmousemove="i18n(this)">Note</span></div> </td> <td><span data-i18n="c978b92f8ad3068db48ed64d841f0d0a59b6d06399ff6af9c2a8bcd12d849dda/72" data-source="When &lt;code&gt;text=auto&lt;/code&gt; conversion is enabled in a cross-platform project using push and pull to a central repository the text files containing CRLFs should be normalized." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;  <code>text=auto</code>  &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ocy; &vcy; &kcy;&rcy;&ocy;&scy;&scy;-&pcy;&lcy;&acy;&tcy;&fcy;&ocy;&rcy;&mcy;&iecy;&ncy;&ncy;&ocy;&mcy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&iecy; &scy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;&mcy; &pcy;&rcy;&icy;&ncy;&ucy;&dcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&jcy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&kcy;&icy; &vcy; &tscy;&iecy;&ncy;&tcy;&rcy;&acy;&lcy;&softcy;&ncy;&ycy;&jcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&jcy;, &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&icy;&iecy; CRLF, &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &bcy;&ycy;&tcy;&softcy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&ocy;&vcy;&acy;&ncy;&ycy;.</span></td> </tr> </table></div> </div> <p><span data-i18n="67d642f3bad53ac1a93965f8e44b08670a25dbda86299a32d5e2fb53ed007e59/ca" data-source="From a clean working directory:" onmousemove="i18n(this)">&Icy;&zcy; &chcy;&icy;&scy;&tcy;&ocy;&gcy;&ocy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&acy;:</span></p> <div> <div> <pre class="hljs language-shell"><span class="hljs-meta prompt_">$ </span><span class="language-bash"><span class="hljs-built_in">echo</span> <span class="hljs-string">&quot;* text=auto&quot;</span> &gt;.gitattributes</span>
<span class="hljs-meta prompt_">$ </span><span class="language-bash">git add --renormalize .</span>
<span class="hljs-meta prompt_">$ </span><span class="language-bash">git status        <span class="hljs-comment" title="# Show files that will be normalized"># &Pcy;&ocy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &fcy;&acy;&jcy;&lcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &bcy;&ucy;&dcy;&ucy;&tcy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&ocy;&vcy;&acy;&ncy;&ycy;</span></span>
<span class="hljs-meta prompt_">$ </span><span class="language-bash">git commit -m <span class="hljs-string">&quot;Introduce end-of-line normalization&quot;</span></span></pre> </div> </div> <p><span data-i18n="56f2b5c2f221be57ea4a079e7b797681ab84ce2169e8b5dcc8c39cfb49d17f0d/e6" data-source="If any files that should not be normalized show up in &lt;code&gt;git status&lt;/code&gt;, unset their &lt;code&gt;text&lt;/code&gt; attribute before running &lt;code&gt;git add -u&lt;/code&gt;." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;  <code>git status</code>  &pcy;&ocy;&yacy;&vcy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &kcy;&acy;&kcy;&icy;&iecy;-&lcy;&icy;&bcy;&ocy; &fcy;&acy;&jcy;&lcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ncy;&iecy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;, &scy;&ncy;&icy;&mcy;&icy;&tcy;&iecy; &icy;&khcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>text</code>  &pcy;&iecy;&rcy;&iecy;&dcy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&ocy;&mcy;  <code>git add -u</code> .</span></p> <div> <div> <pre class="hljs language-scss">manual<span class="hljs-selector-class">.pdf</span>        -text</pre> </div> </div> <p><span data-i18n="5f1867634be3d5539cdbd7639ad8067c516567431e16b69df22d69bd3483af6c/b1" data-source="Conversely, text files that Git does not detect can have normalization enabled manually." onmousemove="i18n(this)">&Icy; &ncy;&acy;&ocy;&bcy;&ocy;&rcy;&ocy;&tcy;, &dcy;&lcy;&yacy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy;  Git  &ncy;&iecy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy;, &ncy;&ocy;&rcy;&mcy;&acy;&lcy;&icy;&zcy;&acy;&tscy;&icy;&yucy; &mcy;&ocy;&zhcy;&ncy;&ocy; &vcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&softcy; &vcy;&rcy;&ucy;&chcy;&ncy;&ucy;&yucy;.</span></p> <div> <div> <pre class="hljs language-scss">weirdchars<span class="hljs-selector-class">.txt</span>        text</pre> </div> </div> <p><span data-i18n="936b2782fda4bac2b6d7b8c742183b56603aa0e819d055c8a5b90e0d3ec00421/73" data-source="If &lt;code&gt;core.safecrlf&lt;/code&gt; is set to &amp;quot;true&amp;quot; or &amp;quot;warn&amp;quot;, Git verifies if the conversion is reversible for the current setting of &lt;code&gt;core.autocrlf&lt;/code&gt;. For &amp;quot;true&amp;quot;, Git rejects irreversible conversions; for &amp;quot;warn&amp;quot;, Git only prints a warning but accepts an irreversible conversion. The safety triggers to prevent such a conversion done to the files in the work tree, but there are a few exceptions. Even though&amp;hellip;&amp;ZeroWidthSpace;" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &dcy;&lcy;&yacy;  <code>core.safecrlf</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ocy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  &quot;true&quot;  &icy;&lcy;&icy;  &quot;warn&quot; ,  Git  &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&yacy;&iecy;&tcy;, &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &lcy;&icy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &ocy;&bcy;&rcy;&acy;&tcy;&icy;&mcy;&ycy;&mcy; &dcy;&lcy;&yacy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&jcy;&kcy;&icy;  <code>core.autocrlf</code> . &Dcy;&lcy;&yacy;  &quot;true&quot;   Git  &ocy;&tcy;&kcy;&lcy;&ocy;&ncy;&yacy;&iecy;&tcy; &ncy;&iecy;&ocy;&bcy;&rcy;&acy;&tcy;&icy;&mcy;&ycy;&iecy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;; &dcy;&lcy;&yacy;  &quot;warn&quot;   Git  &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &pcy;&iecy;&chcy;&acy;&tcy;&acy;&iecy;&tcy; &pcy;&rcy;&iecy;&dcy;&ucy;&pcy;&rcy;&iecy;&zhcy;&dcy;&iecy;&ncy;&icy;&iecy;, &ncy;&ocy; &pcy;&rcy;&icy;&ncy;&icy;&mcy;&acy;&iecy;&tcy; &ncy;&iecy;&ocy;&bcy;&rcy;&acy;&tcy;&icy;&mcy;&ocy;&iecy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;. &Tcy;&rcy;&icy;&gcy;&gcy;&iecy;&rcy;&ycy; &bcy;&iecy;&zcy;&ocy;&pcy;&acy;&scy;&ncy;&ocy;&scy;&tcy;&icy; &pcy;&rcy;&iecy;&dcy;&ocy;&tcy;&vcy;&rcy;&acy;&shchcy;&acy;&yucy;&tcy; &tcy;&acy;&kcy;&ocy;&iecy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;, &ncy;&ocy; &iecy;&scy;&tcy;&softcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&jcy;. &KHcy;&ocy;&tcy;&yacy;&hellip;&ZeroWidthSpace;</span></p> <div> <ul> <li> <p><span data-i18n="11e563a7aa14015bce231ae4e7eebd3aca93df63de3b5ca8f50d1b72554e8e62/05" data-source="&lt;code&gt;git add&lt;/code&gt; itself does not touch the files in the work tree, the next checkout would, so the safety triggers;" onmousemove="i18n(this)">&Scy;&acy;&mcy;  <code>git add</code>  &ncy;&iecy; &tcy;&rcy;&ocy;&gcy;&acy;&iecy;&tcy; &fcy;&acy;&jcy;&lcy;&ycy; &vcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy; &rcy;&acy;&bcy;&ocy;&tcy;&ycy;, &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&acy;&yacy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&kcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy;, &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &scy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy; &bcy;&iecy;&zcy;&ocy;&pcy;&acy;&scy;&ncy;&ocy;&scy;&tcy;&softcy;;</span></p> </li> <li> <p><span data-i18n="9a1f61b9796065c2ab43e88cb6a04c9c1b6a1ec2b0a5462824738211ff97866d/22" data-source="&lt;code&gt;git apply&lt;/code&gt; to update a text file with a patch does touch the files in the work tree, but the operation is about text files and CRLF conversion is about fixing the line ending inconsistencies, so the safety does not trigger;" onmousemove="i18n(this)"><code>git apply</code>  &dcy;&lcy;&yacy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &ncy;&iecy; &zcy;&acy;&tcy;&rcy;&acy;&gcy;&icy;&vcy;&acy;&iecy;&tcy; &fcy;&acy;&jcy;&lcy;&ycy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;, &ncy;&ocy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&yacy; &kcy;&acy;&scy;&acy;&iecy;&tcy;&scy;&yacy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &acy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; CRLF &scy;&vcy;&yacy;&zcy;&acy;&ncy;&ocy; &scy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;&mcy; &ncy;&iecy;&scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&icy;&jcy; &vcy; &kcy;&ocy;&ncy;&tscy;&iecy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;, &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &bcy;&iecy;&zcy;&ocy;&pcy;&acy;&scy;&ncy;&ocy;&scy;&tcy;&softcy; &ncy;&iecy; &scy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy;;</span></p> </li> <li> <p><span data-i18n="370078d2c87883e613716b35622468a9d12ac4e91f0d1777ca518755eb539db5/8d" data-source="&lt;code&gt;git diff&lt;/code&gt; itself does not touch the files in the work tree, it is often run to inspect the changes you intend to next &lt;code&gt;git add&lt;/code&gt;. To catch potential problems early, safety triggers." onmousemove="i18n(this)">&Scy;&acy;&mcy;  <code>git diff</code>  &ncy;&iecy; &tcy;&rcy;&ocy;&gcy;&acy;&iecy;&tcy; &fcy;&acy;&jcy;&lcy;&ycy; &vcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy; &rcy;&acy;&bcy;&ocy;&tcy;&ycy;, &ocy;&ncy; &chcy;&acy;&scy;&tcy;&ocy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&kcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &vcy;&ycy; &scy;&ocy;&bcy;&icy;&rcy;&acy;&iecy;&tcy;&iecy;&scy;&softcy; &vcy;&ncy;&iecy;&scy;&tcy;&icy; &vcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&jcy;  <code>git add</code> . &Dcy;&lcy;&yacy; &rcy;&acy;&ncy;&ncy;&iecy;&gcy;&ocy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&iecy;&ncy;&icy;&yacy; &pcy;&ocy;&tcy;&iecy;&ncy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ycy;&khcy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy; &scy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&yucy;&tcy; &tcy;&rcy;&icy;&gcy;&gcy;&iecy;&rcy;&ycy; &bcy;&iecy;&zcy;&ocy;&pcy;&acy;&scy;&ncy;&ocy;&scy;&tcy;&icy;.</span></p> </li> </ul> </div> </div> <div> <h4 class="text-body-emphasis"  id="_working_tree_encoding">
<code>working-tree-encoding</code>
</h4> <p><span data-i18n="49c36a6ccf51b2438108cda28960702f6fdba22f902212855a577e16babbf047/dd" data-source="Git recognizes files encoded in ASCII or one of its supersets (e.g. UTF-8, ISO-8859-1, &amp;hellip;&amp;ZeroWidthSpace;) as text files. Files encoded in certain other encodings (e.g. UTF-16) are interpreted as binary and consequently built-in Git text processing tools (e.g. &lt;code&gt;git diff&lt;/code&gt;) as well as most Git web front ends do not visualize the contents of these files by default." onmousemove="i18n(this)">Git  &rcy;&acy;&scy;&pcy;&ocy;&zcy;&ncy;&acy;&iecy;&tcy; &fcy;&acy;&jcy;&lcy;&ycy;, &zcy;&acy;&kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &vcy; ASCII &icy;&lcy;&icy; &ocy;&dcy;&ncy;&ocy;&mcy; &icy;&zcy; &iecy;&gcy;&ocy; &rcy;&acy;&scy;&shcy;&icy;&rcy;&iecy;&ncy;&ncy;&ycy;&khcy; &ncy;&acy;&bcy;&ocy;&rcy;&ocy;&vcy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, UTF-8, ISO-8859-1, &hellip;&ZeroWidthSpace;), &kcy;&acy;&kcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy;. &Fcy;&acy;&jcy;&lcy;&ycy;, &zcy;&acy;&kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &vcy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&acy;&khcy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, UTF-16), &icy;&ncy;&tcy;&iecy;&rcy;&pcy;&rcy;&iecy;&tcy;&icy;&rcy;&ucy;&yucy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy;, &icy;, &scy;&lcy;&iecy;&dcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;, &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ycy; &ocy;&bcy;&rcy;&acy;&bcy;&ocy;&tcy;&kcy;&icy; &tcy;&iecy;&kcy;&scy;&tcy;&acy;  Git  (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;,  <code>git diff</code> ), &acy; &tcy;&acy;&kcy;&zhcy;&iecy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&ncy;&scy;&tcy;&vcy;&ocy; &vcy;&iecy;&bcy;-&icy;&ncy;&tcy;&iecy;&rcy;&fcy;&iecy;&jcy;&scy;&ocy;&vcy;  Git  &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &ncy;&iecy; &vcy;&icy;&zcy;&ucy;&acy;&lcy;&icy;&zcy;&icy;&rcy;&ucy;&yucy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &ecy;&tcy;&icy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;.</span></p> <p><span data-i18n="3e94e33785bf7d9512d0ca897ade4baf3c870ac3f02fe85a214c377fd3e4609a/22" data-source="In these cases you can tell Git the encoding of a file in the working directory with the &lt;code&gt;working-tree-encoding&lt;/code&gt; attribute. If a file with this attribute is added to Git, then Git re-encodes the content from the specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded content in its internal data structure (called &amp;quot;the index&amp;quot;). On checkout the content is re-encoded back to the specified encoding." onmousemove="i18n(this)">&Vcy; &ecy;&tcy;&icy;&khcy; &scy;&lcy;&ucy;&chcy;&acy;&yacy;&khcy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;  Git  &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&ucy; &fcy;&acy;&jcy;&lcy;&acy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;  <code>working-tree-encoding</code> . &IEcy;&scy;&lcy;&icy; &fcy;&acy;&jcy;&lcy; &scy; &ecy;&tcy;&icy;&mcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&mcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &vcy;  Git , &tcy;&ocy;  Git  &pcy;&iecy;&rcy;&iecy;&kcy;&ocy;&dcy;&icy;&rcy;&ucy;&iecy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &icy;&zcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&icy; &vcy; UTF-8. &Ncy;&acy;&kcy;&ocy;&ncy;&iecy;&tscy;,  Git  &scy;&ocy;&khcy;&rcy;&acy;&ncy;&yacy;&iecy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &vcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&iecy; UTF-8 &vcy; &scy;&vcy;&ocy;&iecy;&jcy; &vcy;&ncy;&ucy;&tcy;&rcy;&iecy;&ncy;&ncy;&iecy;&jcy; &scy;&tcy;&rcy;&ucy;&kcy;&tcy;&ucy;&rcy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&khcy; (&ncy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&mcy;&ocy;&jcy;  &quot;the index&quot; ). &Pcy;&rcy;&icy; &ocy;&fcy;&ocy;&rcy;&mcy;&lcy;&iecy;&ncy;&icy;&icy; &zcy;&acy;&kcy;&acy;&zcy;&acy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &pcy;&iecy;&rcy;&iecy;&kcy;&ocy;&dcy;&icy;&rcy;&ucy;&iecy;&tcy;&scy;&yacy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy; &vcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&ucy;.</span></p> <p><span data-i18n="7244705a487988e155f9e6d0bdfc0c205a2313460b5ce1b61ee616e9fc17d648/09" data-source="Please note that using the &lt;code&gt;working-tree-encoding&lt;/code&gt; attribute may have a number of pitfalls:" onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;  <code>working-tree-encoding</code>  &mcy;&ocy;&zhcy;&iecy;&tcy; &icy;&mcy;&iecy;&tcy;&softcy; &rcy;&yacy;&dcy; &pcy;&ocy;&dcy;&vcy;&ocy;&dcy;&ncy;&ycy;&khcy; &kcy;&acy;&mcy;&ncy;&iecy;&jcy;:</span></p> <div> <ul> <li> <p><span data-i18n="612df107b9469cb05984d79a3c876fb11c680d26c67a1b360d3fca9793e9f360/ed" data-source="Alternative Git implementations (e.g. JGit or libgit2) and older Git versions (as of March 2018) do not support the &lt;code&gt;working-tree-encoding&lt;/code&gt; attribute. If you decide to use the &lt;code&gt;working-tree-encoding&lt;/code&gt; attribute in your repository, then it is strongly recommended to ensure that all clients working with the repository support it." onmousemove="i18n(this)">&Acy;&lcy;&softcy;&tcy;&iecy;&rcy;&ncy;&acy;&tcy;&icy;&vcy;&ncy;&ycy;&iecy; &rcy;&iecy;&acy;&lcy;&icy;&zcy;&acy;&tscy;&icy;&icy;  Git  (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, J  Git  &icy;&lcy;&icy; libgit2) &icy; &bcy;&ocy;&lcy;&iecy;&iecy; &scy;&tcy;&acy;&rcy;&ycy;&iecy; &vcy;&iecy;&rcy;&scy;&icy;&icy;  Git  (&pcy;&ocy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&yucy; &ncy;&acy; &mcy;&acy;&rcy;&tcy; 2018 &gcy;.) &ncy;&iecy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&yucy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>working-tree-encoding</code> . &IEcy;&scy;&lcy;&icy; &vcy;&ycy; &rcy;&iecy;&shcy;&icy;&tcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>working-tree-encoding</code>  &vcy; &scy;&vcy;&ocy;&iecy;&mcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy;, &tcy;&ocy; &ncy;&acy;&scy;&tcy;&ocy;&yacy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &rcy;&iecy;&kcy;&ocy;&mcy;&iecy;&ncy;&dcy;&ucy;&iecy;&tcy;&scy;&yacy; &ucy;&bcy;&iecy;&dcy;&icy;&tcy;&softcy;&scy;&yacy;, &chcy;&tcy;&ocy; &vcy;&scy;&iecy; &kcy;&lcy;&icy;&iecy;&ncy;&tcy;&ycy;, &rcy;&acy;&bcy;&ocy;&tcy;&acy;&yucy;&shchcy;&icy;&iecy; &scy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&iecy;&mcy;, &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&yucy;&tcy; &iecy;&gcy;&ocy;.</span></p> <p><span data-i18n="0b1cb670d8d5266251124721bc02a15e33eb0d53f45f25c0577c39dfd87f2911/13" data-source="For example, Microsoft Visual Studio resources files (&lt;code&gt;*.rc&lt;/code&gt;) or PowerShell script files (&lt;code&gt;*.ps1&lt;/code&gt;) are sometimes encoded in UTF-16. If you declare &lt;code&gt;*.ps1&lt;/code&gt; as files as UTF-16 and you add &lt;code&gt;foo.ps1&lt;/code&gt; with a &lt;code&gt;working-tree-encoding&lt;/code&gt; enabled Git client, then &lt;code&gt;foo.ps1&lt;/code&gt; will be stored as UTF-8 internally. A client without &lt;code&gt;working-tree-encoding&lt;/code&gt; support will checkout &lt;code&gt;foo.ps1&lt;/code&gt; as UTF-8 encoded file. This will typically cause trouble for the users of this file." onmousemove="i18n(this)">&Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &fcy;&acy;&jcy;&lcy;&ycy; &rcy;&iecy;&scy;&ucy;&rcy;&scy;&ocy;&vcy; Microsoft Visual Studio (  <code>*.rc</code>  ) &icy;&lcy;&icy; &fcy;&acy;&jcy;&lcy;&ycy; &scy;&tscy;&iecy;&ncy;&acy;&rcy;&icy;&iecy;&vcy; PowerShell (  <code>*.ps1</code>  ) &icy;&ncy;&ocy;&gcy;&dcy;&acy; &kcy;&ocy;&dcy;&icy;&rcy;&ucy;&yucy;&tcy;&scy;&yacy; &vcy; UTF-16. &IEcy;&scy;&lcy;&icy; &vcy;&ycy; &ocy;&bcy;&hardcy;&yacy;&vcy;&icy;&tcy;&iecy;  <code>*.ps1</code>  &vcy; &vcy;&icy;&dcy;&iecy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &kcy;&acy;&kcy; UTF-16 &icy; &dcy;&ocy;&bcy;&acy;&vcy;&icy;&tcy;&iecy;  <code>foo.ps1</code>  &scy; &kcy;&lcy;&icy;&iecy;&ncy;&tcy;&ocy;&mcy;  Git  &scy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&kcy;&ocy;&jcy;  <code>working-tree-encoding</code> , &tcy;&ocy;&gcy;&dcy;&acy;  <code>foo.ps1</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &khcy;&rcy;&acy;&ncy;&icy;&tcy;&softcy;&scy;&yacy; &vcy;&ncy;&ucy;&tcy;&rcy;&icy; &kcy;&acy;&kcy; UTF-8. &Kcy;&lcy;&icy;&iecy;&ncy;&tcy; &bcy;&iecy;&zcy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&kcy;&icy;  <code>working-tree-encoding</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&zcy;&vcy;&lcy;&iecy;&kcy;&acy;&tcy;&softcy;  <code>foo.ps1</code>  &kcy;&acy;&kcy; &fcy;&acy;&jcy;&lcy; &vcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&iecy; UTF-8. &Ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &ecy;&tcy;&ocy; &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy;&ycy; &ucy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&iecy;&jcy; &ecy;&tcy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;.</span></p> <p><span data-i18n="139c52aa3109c4eff5e9a8ce03ab8d9b8537fc4d1d1d62a04f5e1de8fddca244/43" data-source="If a Git client that does not support the &lt;code&gt;working-tree-encoding&lt;/code&gt; attribute adds a new file &lt;code&gt;bar.ps1&lt;/code&gt;, then &lt;code&gt;bar.ps1&lt;/code&gt; will be stored &amp;quot;as-is&amp;quot; internally (in this example probably as UTF-16). A client with &lt;code&gt;working-tree-encoding&lt;/code&gt; support will interpret the internal contents as UTF-8 and try to convert it to UTF-16 on checkout. That operation will fail and cause an error." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &kcy;&lcy;&icy;&iecy;&ncy;&tcy;  Git , &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &ncy;&iecy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>working-tree-encoding</code> , &dcy;&ocy;&bcy;&acy;&vcy;&icy;&tcy; &ncy;&ocy;&vcy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy;  <code>bar.ps1</code> , &tcy;&ocy;  <code>bar.ps1</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &khcy;&rcy;&acy;&ncy;&icy;&tcy;&softcy;&scy;&yacy; &vcy;&ncy;&ucy;&tcy;&rcy;&icy;  &quot;as-is&quot;  (&vcy; &ecy;&tcy;&ocy;&mcy; &pcy;&rcy;&icy;&mcy;&iecy;&rcy;&iecy;, &vcy;&iecy;&rcy;&ocy;&yacy;&tcy;&ncy;&ocy;, &kcy;&acy;&kcy; UTF-16). &Kcy;&lcy;&icy;&iecy;&ncy;&tcy; &scy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&kcy;&ocy;&jcy;  <code>working-tree-encoding</code>  &icy;&ncy;&tcy;&iecy;&rcy;&pcy;&rcy;&iecy;&tcy;&icy;&rcy;&ucy;&iecy;&tcy; &vcy;&ncy;&ucy;&tcy;&rcy;&iecy;&ncy;&ncy;&iecy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &kcy;&acy;&kcy; UTF-8 &icy; &pcy;&ocy;&pcy;&ycy;&tcy;&acy;&iecy;&tcy;&scy;&yacy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &iecy;&gcy;&ocy; &vcy; UTF-16 &pcy;&rcy;&icy; &ocy;&fcy;&ocy;&rcy;&mcy;&lcy;&iecy;&ncy;&icy;&icy; &zcy;&acy;&kcy;&acy;&zcy;&acy;. &Ecy;&tcy;&acy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&yacy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&icy;&tcy;&scy;&yacy; &ncy;&iecy;&ucy;&dcy;&acy;&chcy;&ncy;&ocy; &icy; &vcy;&ycy;&zcy;&ocy;&vcy;&iecy;&tcy; &ocy;&shcy;&icy;&bcy;&kcy;&ucy;.</span></p> </li> <li> <p><span data-i18n="8e56af1780b86b77c76ac538ce4734e190ef7f62cd4ffdb878977d73e4294366/1c" data-source="Reencoding content to non-UTF encodings can cause errors as the conversion might not be UTF-8 round trip safe. If you suspect your encoding to not be round trip safe, then add it to &lt;code&gt;core.checkRoundtripEncoding&lt;/code&gt; to make Git check the round trip encoding (see &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt;). SHIFT-JIS (Japanese character set) is known to have round trip issues with UTF-8 and is checked by default." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy; &vcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&icy;, &ocy;&tcy;&lcy;&icy;&chcy;&ncy;&ycy;&iecy; &ocy;&tcy; UTF, &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&rcy;&icy;&vcy;&iecy;&scy;&tcy;&icy; &kcy; &ocy;&shcy;&icy;&bcy;&kcy;&acy;&mcy;, &pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &bcy;&ycy;&tcy;&softcy; &ncy;&iecy;&bcy;&iecy;&zcy;&ocy;&pcy;&acy;&scy;&ncy;&ycy;&mcy; &dcy;&lcy;&yacy; UTF-8. &IEcy;&scy;&lcy;&icy; &vcy;&ycy; &pcy;&ocy;&dcy;&ocy;&zcy;&rcy;&iecy;&vcy;&acy;&iecy;&tcy;&iecy;, &chcy;&tcy;&ocy; &vcy;&acy;&shcy;&acy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&acy; &ncy;&iecy;&bcy;&iecy;&zcy;&ocy;&pcy;&acy;&scy;&ncy;&acy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&chcy;&icy; &tcy;&ucy;&dcy;&acy; &icy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy;, &dcy;&ocy;&bcy;&acy;&vcy;&softcy;&tcy;&iecy; &iecy;&iecy; &vcy;  <code>core.checkRoundtripEncoding</code> , &chcy;&tcy;&ocy;&bcy;&ycy;  Git  &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&icy;&lcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&ucy; &tcy;&ucy;&dcy;&acy; &icy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy; (&scy;&mcy;.  <a href="git-config.html">git-config[1]</a> ). SHIFT-JIS (&ncy;&acy;&bcy;&ocy;&rcy; &yacy;&pcy;&ocy;&ncy;&scy;&kcy;&icy;&khcy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&ocy;&vcy;), &kcy;&acy;&kcy; &icy;&zcy;&vcy;&iecy;&scy;&tcy;&ncy;&ocy;, &icy;&mcy;&iecy;&iecy;&tcy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy;&ycy; &scy; UTF-8 &icy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&iecy;&ncy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy;.</span></p> </li> <li> <p><span data-i18n="d02846cf56dcf7a7d0145accdb1aa056c216f3c1cbd752d0e854c97f751b269a/22" data-source="Reencoding content requires resources that might slow down certain Git operations (e.g &lt;code&gt;git checkout&lt;/code&gt; or &lt;code&gt;git add&lt;/code&gt;)." onmousemove="i18n(this)">&Dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;&acy; &tcy;&rcy;&iecy;&bcy;&ucy;&yucy;&tcy;&scy;&yacy; &rcy;&iecy;&scy;&ucy;&rcy;&scy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &mcy;&ocy;&gcy;&ucy;&tcy; &zcy;&acy;&mcy;&iecy;&dcy;&lcy;&icy;&tcy;&softcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&iecy; &ocy;&pcy;&iecy;&rcy;&acy;&tscy;&icy;&icy;  Git  (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;,  <code>git checkout</code>  &icy;&lcy;&icy;  <code>git add</code> ).</span></p> </li> </ul> </div> <p><span data-i18n="ede0aeb26cdf20427c85d1300850ab0d7e63edae1b233cfc15824ac93cdf8ee2/5d" data-source="Use the &lt;code&gt;working-tree-encoding&lt;/code&gt; attribute only if you cannot store a file in UTF-8 encoding and if you want Git to be able to process the content as text." onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>working-tree-encoding</code>  &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &vcy; &tcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&icy;&tcy;&softcy; &fcy;&acy;&jcy;&lcy; &vcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&iecy; UTF-8 &icy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy;, &chcy;&tcy;&ocy;&bcy;&ycy;  Git  &mcy;&ocy;&gcy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &kcy;&acy;&kcy; &tcy;&iecy;&kcy;&scy;&tcy;.</span></p> <p><span data-i18n="647b2660dfa4ea2321723c1207e2223a82667b14a5ece444347c88e3bc5d8339/3b" data-source="As an example, use the following attributes if your &lt;code&gt;*.ps1&lt;/code&gt; files are UTF-16 encoded with byte order mark (BOM) and you want Git to perform automatic line ending conversion based on your platform." onmousemove="i18n(this)">&Vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &pcy;&rcy;&icy;&mcy;&iecy;&rcy;&acy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;, &iecy;&scy;&lcy;&icy; &vcy;&acy;&shcy;&icy; &fcy;&acy;&jcy;&lcy;&ycy;  <code>*.ps1</code>  &icy;&mcy;&iecy;&yucy;&tcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&ucy; UTF-16 &scy; &mcy;&iecy;&tcy;&kcy;&ocy;&jcy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&acy; &bcy;&acy;&jcy;&tcy;&ocy;&vcy; (BOM) &icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy;, &chcy;&tcy;&ocy;&bcy;&ycy;  Git  &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&lcy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&iecy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &kcy;&ocy;&ncy;&tscy;&acy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &vcy; &zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &ocy;&tcy; &vcy;&acy;&shcy;&iecy;&jcy; &pcy;&lcy;&acy;&tcy;&fcy;&ocy;&rcy;&mcy;&ycy;.</span></p> <div> <div> <pre class="hljs language-vbnet">*.ps1                <span class="hljs-keyword">text</span> working-tree-encoding=UTF-<span class="hljs-number">16</span></pre> </div> </div> <p><span data-i18n="4824313d29e7224b2255113778666c29986e807aea3129df50d9cb922b40d1eb/f6" data-source="Use the following attributes if your &lt;code&gt;*.ps1&lt;/code&gt; files are UTF-16 little endian encoded without BOM and you want Git to use Windows line endings in the working directory (use &lt;code&gt;UTF-16LE-BOM&lt;/code&gt; instead of &lt;code&gt;UTF-16LE&lt;/code&gt; if you want UTF-16 little endian with BOM). Please note, it is highly recommended to explicitly define the line endings with &lt;code&gt;eol&lt;/code&gt; if the &lt;code&gt;working-tree-encoding&lt;/code&gt; attribute is used to avoid ambiguity." onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;, &iecy;&scy;&lcy;&icy; &vcy;&acy;&shcy;&icy; &fcy;&acy;&jcy;&lcy;&ycy;  <code>*.ps1</code>  &icy;&mcy;&iecy;&yucy;&tcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&ucy; UTF-16 &scy; &pcy;&rcy;&yacy;&mcy;&ycy;&mcy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&ocy;&mcy; &bcy;&acy;&jcy;&tcy;&ocy;&vcy; &bcy;&iecy;&zcy; &scy;&pcy;&iecy;&tscy;&icy;&fcy;&icy;&kcy;&acy;&tscy;&icy;&icy;, &icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy;, &chcy;&tcy;&ocy;&bcy;&ycy;  Git  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&lcy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy; Windows &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy; (&icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy;  <code>UTF-16LE-BOM</code>  &vcy;&mcy;&iecy;&scy;&tcy;&ocy;  <code>UTF-16LE</code> , &iecy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy;, &chcy;&tcy;&ocy;&bcy;&ycy; &scy;&ocy; &scy;&pcy;&iecy;&tscy;&icy;&fcy;&icy;&kcy;&acy;&tscy;&icy;&iecy;&jcy; UTF-16 &scy; &pcy;&rcy;&yacy;&mcy;&ycy;&mcy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&ocy;&mcy; &bcy;&acy;&jcy;&tcy;&ocy;&vcy;). &Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;: &vcy;&ocy; &icy;&zcy;&bcy;&iecy;&zhcy;&acy;&ncy;&icy;&iecy; &dcy;&vcy;&ucy;&scy;&mcy;&ycy;&scy;&lcy;&iecy;&ncy;&ncy;&ocy;&scy;&tcy;&icy; &ncy;&acy;&scy;&tcy;&ocy;&yacy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &rcy;&iecy;&kcy;&ocy;&mcy;&iecy;&ncy;&dcy;&ucy;&iecy;&tcy;&scy;&yacy; &yacy;&vcy;&ncy;&ocy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&tcy;&softcy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&ncy;&icy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>eol</code> , &iecy;&scy;&lcy;&icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>working-tree-encoding</code> .</span></p> <div> <div> <pre class="hljs language-vbnet">*.ps1                <span class="hljs-keyword">text</span> working-tree-encoding=UTF-<span class="hljs-number">16L</span>E eol=CRLF</pre> </div> </div> <p><span data-i18n="184f1f71763d03362b2377bafe5115389576832d42c0266d01b1bfb5b792ac38/62" data-source="You can get a list of all available encodings on your platform with the following command:" onmousemove="i18n(this)">&Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &pcy;&ocy;&lcy;&ucy;&chcy;&icy;&tcy;&softcy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &vcy;&scy;&iecy;&khcy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy;&khcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&ocy;&kcy; &ncy;&acy; &vcy;&acy;&shcy;&iecy;&jcy; &pcy;&lcy;&acy;&tcy;&fcy;&ocy;&rcy;&mcy;&iecy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&jcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy;:</span></p> <div> <div> <pre class="hljs language-css">iconv <span class="hljs-attr">--list</span></pre> </div> </div> <p><span data-i18n="debd78944df460b53c445c5f32d76c2012af7d61e997b85d0919b79b241ecdf6/39" data-source="If you do not know the encoding of a file, then you can use the &lt;code&gt;file&lt;/code&gt; command to guess the encoding:" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &ncy;&iecy; &zcy;&ncy;&acy;&iecy;&tcy;&iecy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&ucy; &fcy;&acy;&jcy;&lcy;&acy;, &tcy;&ocy; &ucy;&gcy;&acy;&dcy;&acy;&tcy;&softcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&ucy; &mcy;&ocy;&zhcy;&ncy;&ocy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy;  <code>file</code> :</span></p> <div> <div> <pre class="hljs language-undefined">file foo.ps1</pre> </div> </div> </div> <div> <h4 class="text-body-emphasis"  id="_ident">
<code>ident</code>
</h4> <p><span data-i18n="7edb63daa207487852dc3fcd6937b6afcb217eae44e74665225a40d5eb6c6a4c/1e" data-source="When the attribute &lt;code&gt;ident&lt;/code&gt; is set for a path, Git replaces &lt;code&gt;$Id$&lt;/code&gt; in the blob object with &lt;code&gt;$Id:&lt;/code&gt;, followed by the 40-character hexadecimal blob object name, followed by a dollar sign &lt;code&gt;$&lt;/code&gt; upon checkout. Any byte sequence that begins with &lt;code&gt;$Id:&lt;/code&gt; and ends with &lt;code&gt;$&lt;/code&gt; in the worktree file is replaced with &lt;code&gt;$Id$&lt;/code&gt; upon check-in." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &dcy;&lcy;&yacy; &pcy;&ucy;&tcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>ident</code> ,  Git  &zcy;&acy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy;  <code>$Id$</code>  &vcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&iecy; BLOB-&ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&acy; &ncy;&acy;  <code>$Id:</code>  , &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; 40-&zcy;&ncy;&acy;&chcy;&ncy;&ocy;&iecy; &shcy;&iecy;&scy;&tcy;&ncy;&acy;&dcy;&tscy;&acy;&tcy;&iecy;&rcy;&icy;&chcy;&ncy;&ocy;&iecy; &icy;&mcy;&yacy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&acy; BLOB-&ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&acy;, &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &zcy;&ncy;&acy;&kcy; &dcy;&ocy;&lcy;&lcy;&acy;&rcy;&acy;  <code>$</code>  &pcy;&rcy;&icy; &ocy;&fcy;&ocy;&rcy;&mcy;&lcy;&iecy;&ncy;&icy;&icy; &zcy;&acy;&kcy;&acy;&zcy;&acy;. &Lcy;&yucy;&bcy;&acy;&yacy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&scy;&tcy;&softcy; &bcy;&acy;&jcy;&tcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &ncy;&acy;&chcy;&icy;&ncy;&acy;&iecy;&tcy;&scy;&yacy; &scy;  <code>$Id:</code>  &icy; &zcy;&acy;&kcy;&acy;&ncy;&chcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy;  <code>$</code>  &vcy; &fcy;&acy;&jcy;&lcy;&iecy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy;, &zcy;&acy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &ncy;&acy;  <code>$Id$</code>  &pcy;&rcy;&icy; &rcy;&iecy;&gcy;&icy;&scy;&tcy;&rcy;&acy;&tscy;&icy;&icy;.</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_filter">
<code>filter</code>
</h4> <p><span data-i18n="0d17ba2676899cd6b0c4de4aac3447b0159ab2bb49b3be3c4ed5524f4f14c297/bf" data-source="A &lt;code&gt;filter&lt;/code&gt; attribute can be set to a string value that names a filter driver specified in the configuration." onmousemove="i18n(this)">&Acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ucy;  <code>filter</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &pcy;&rcy;&icy;&scy;&vcy;&ocy;&icy;&tcy;&softcy; &scy;&tcy;&rcy;&ocy;&kcy;&ocy;&vcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&iecy; &ncy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;, &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ycy;&jcy; &vcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;.</span></p> <p><span data-i18n="2fa4adb4e0e713e6dc207386c677812d6bf7703131f77415184813f99c2a6265/74" data-source="A filter driver consists of a &lt;code&gt;clean&lt;/code&gt; command and a &lt;code&gt;smudge&lt;/code&gt; command, either of which can be left unspecified. Upon checkout, when the &lt;code&gt;smudge&lt;/code&gt; command is specified, the command is fed the blob object from its standard input, and its standard output is used to update the worktree file. Similarly, the &lt;code&gt;clean&lt;/code&gt; command is used to convert the contents of worktree file upon checkin. By default these commands process only a single blob and terminate. If a long running &lt;code&gt;process&lt;/code&gt; filter is used in place of &lt;code&gt;clean&lt;/code&gt; and/or &lt;code&gt;smudge&lt;/code&gt; filters, then Git can process all blobs with a single filter command invocation for the entire life of a single Git command, for example &lt;code&gt;git add --all&lt;/code&gt;. If a long running &lt;code&gt;process&lt;/code&gt; filter is configured then it always takes precedence over a configured single blob filter. See section below for the description of the protocol used to communicate with a &lt;code&gt;process&lt;/code&gt; filter." onmousemove="i18n(this)">&Dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &scy;&ocy;&scy;&tcy;&ocy;&icy;&tcy; &icy;&zcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy;  <code>clean</code>  &icy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy;  <code>smudge</code> , &lcy;&yucy;&bcy;&ucy;&yucy; &icy;&zcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&tcy;&softcy;. &Pcy;&rcy;&icy; &ocy;&fcy;&ocy;&rcy;&mcy;&lcy;&iecy;&ncy;&icy;&icy; &zcy;&acy;&kcy;&acy;&zcy;&acy;, &iecy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&acy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy;  <code>smudge</code> , &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&iecy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy; blob &scy;&ocy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ocy;&gcy;&ocy; &vcy;&vcy;&ocy;&dcy;&acy;, &acy; &iecy;&iecy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ycy;&jcy; &vcy;&ycy;&vcy;&ocy;&dcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &fcy;&acy;&jcy;&lcy;&acy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy;. &Acy;&ncy;&acy;&lcy;&ocy;&gcy;&icy;&chcy;&ncy;&ocy;, &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy;  <code>clean</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &pcy;&rcy;&icy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy;&iecy;. &Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &ecy;&tcy;&icy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&yucy;&tcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &ocy;&dcy;&icy;&ncy; &bcy;&ocy;&lcy;&softcy;&shcy;&ocy;&jcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&jcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy; &icy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&acy;&yucy;&tcy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy;. &IEcy;&scy;&lcy;&icy; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&ocy;&vcy;  <code>clean</code>  &icy;/&icy;&lcy;&icy;  <code>smudge</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&ocy;&lcy;&gcy;&ocy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&yucy;&shchcy;&icy;&jcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;  <code>process</code> , &tcy;&ocy;  Git  &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &vcy;&scy;&iecy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&iecy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ycy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &vcy;&ycy;&zcy;&ocy;&vcy;&acy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &vcy; &tcy;&iecy;&chcy;&iecy;&ncy;&icy;&iecy; &vcy;&scy;&iecy;&gcy;&ocy; &scy;&rcy;&ocy;&kcy;&acy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&yacy; &ocy;&dcy;&ncy;&ocy;&jcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy;  Git , &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;  <code>git add --all</code> . &IEcy;&scy;&lcy;&icy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy; &dcy;&ocy;&lcy;&gcy;&ocy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&yucy;&shchcy;&icy;&jcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;  <code>process</code> , &ocy;&ncy; &vcy;&scy;&iecy;&gcy;&dcy;&acy; &icy;&mcy;&iecy;&iecy;&tcy; &pcy;&rcy;&icy;&ocy;&rcy;&icy;&tcy;&iecy;&tcy; &ncy;&acy;&dcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&mcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&ocy;&mcy; &scy; &ocy;&dcy;&ncy;&icy;&mcy; BLOB-&ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ocy;&mcy;. &Scy;&mcy;. &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &ncy;&icy;&zhcy;&iecy; &dcy;&lcy;&yacy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&icy;&yacy; &pcy;&rcy;&ocy;&tcy;&ocy;&kcy;&ocy;&lcy;&acy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&mcy;&ocy;&gcy;&ocy; &dcy;&lcy;&yacy; &scy;&vcy;&yacy;&zcy;&icy; &scy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&ocy;&mcy;  <code>process</code> .</span></p> <p><span data-i18n="7c3f68baccb2053597bb866b2a558441b67336eaae666be7270b52eb3f0f48cd/43" data-source="One use of the content filtering is to massage the content into a shape that is more convenient for the platform, filesystem, and the user to use. For this mode of operation, the key phrase here is &amp;quot;more convenient&amp;quot; and not &amp;quot;turning something unusable into usable&amp;quot;. In other words, the intent is that if someone unsets the filter driver definition, or does not have the appropriate filter program, the project should still be usable." onmousemove="i18n(this)">&Ocy;&dcy;&ncy;&icy;&mcy; &icy;&zcy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;&tscy;&icy;&icy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;&acy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &pcy;&rcy;&icy;&dcy;&acy;&ncy;&icy;&iecy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;&ucy; &fcy;&ocy;&rcy;&mcy;&ycy;, &bcy;&ocy;&lcy;&iecy;&iecy; &ucy;&dcy;&ocy;&bcy;&ncy;&ocy;&jcy; &dcy;&lcy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &pcy;&lcy;&acy;&tcy;&fcy;&ocy;&rcy;&mcy;&ocy;&jcy;, &fcy;&acy;&jcy;&lcy;&ocy;&vcy;&ocy;&jcy; &scy;&icy;&scy;&tcy;&iecy;&mcy;&ocy;&jcy; &icy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&iecy;&mcy;. &Dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &rcy;&iecy;&zhcy;&icy;&mcy;&acy; &rcy;&acy;&bcy;&ocy;&tcy;&ycy; &kcy;&lcy;&yucy;&chcy;&iecy;&vcy;&acy;&yacy; &fcy;&rcy;&acy;&zcy;&acy; &zcy;&dcy;&iecy;&scy;&softcy;  &quot;more convenient&quot;  &acy; &ncy;&iecy;  &quot;turning something unusable into usable&quot; . &Dcy;&rcy;&ucy;&gcy;&icy;&mcy;&icy; &scy;&lcy;&ocy;&vcy;&acy;&mcy;&icy;, &tscy;&iecy;&lcy;&softcy; &scy;&ocy;&scy;&tcy;&ocy;&icy;&tcy; &vcy; &tcy;&ocy;&mcy;, &chcy;&tcy;&ocy;&bcy;&ycy;, &iecy;&scy;&lcy;&icy; &kcy;&tcy;&ocy;-&tcy;&ocy; &ocy;&tcy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &icy;&lcy;&icy; &ncy;&iecy; &icy;&mcy;&iecy;&iecy;&tcy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&iecy;&jcy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ycy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;, &pcy;&rcy;&ocy;&iecy;&kcy;&tcy; &vcy;&scy;&iecy; &rcy;&acy;&vcy;&ncy;&ocy; &mcy;&ocy;&zhcy;&ncy;&ocy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;.</span></p> <p><span data-i18n="fd072b7add9d7d432181f3b7394fa9c27885eabdd6ca30f039da4e193cdbb490/70" data-source="Another use of the content filtering is to store the content that cannot be directly used in the repository (e.g. a UUID that refers to the true content stored outside Git, or an encrypted content) and turn it into a usable form upon checkout (e.g. download the external content, or decrypt the encrypted content)." onmousemove="i18n(this)">&Dcy;&rcy;&ucy;&gcy;&ocy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;&tscy;&icy;&icy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;&acy; &mdash; &khcy;&rcy;&acy;&ncy;&icy;&tcy;&softcy; &vcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &ncy;&iecy;&lcy;&softcy;&zcy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &ncy;&acy;&pcy;&rcy;&yacy;&mcy;&ucy;&yucy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, UUID, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &scy;&scy;&ycy;&lcy;&acy;&iecy;&tcy;&scy;&yacy; &ncy;&acy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;  true , &khcy;&rcy;&acy;&ncy;&yacy;&shchcy;&icy;&jcy;&scy;&yacy; &vcy;&ncy;&iecy; Git, &icy;&lcy;&icy; &zcy;&acy;&shcy;&icy;&fcy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&jcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;) &icy; &pcy;&rcy;&iecy;&vcy;&rcy;&acy;&shchcy;&acy;&tcy;&softcy; &iecy;&gcy;&ocy; &vcy; &ucy;&dcy;&ocy;&bcy;&ncy;&ucy;&yucy; &fcy;&ocy;&rcy;&mcy;&ucy; &pcy;&rcy;&icy; &ocy;&fcy;&ocy;&rcy;&mcy;&lcy;&iecy;&ncy;&icy;&icy; &zcy;&acy;&kcy;&acy;&zcy;&acy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &zcy;&acy;&gcy;&rcy;&ucy;&zcy;&kcy;&acy; &vcy;&ncy;&iecy;&shcy;&ncy;&icy;&jcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy; &icy;&lcy;&icy; &rcy;&acy;&scy;&shcy;&icy;&fcy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &zcy;&acy;&shcy;&icy;&fcy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&jcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;).</span></p> <p><span data-i18n="4ba5b6f5a3dcdfb89c90dd1d2ef3db2d60b0af070cd40ef2eb8364cb2bb4e41c/32" data-source="These two filters behave differently, and by default, a filter is taken as the former, massaging the contents into more convenient shape. A missing filter driver definition in the config, or a filter driver that exits with a non-zero status, is not an error but makes the filter a no-op passthru." onmousemove="i18n(this)">&Ecy;&tcy;&icy; &dcy;&vcy;&acy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &vcy;&iecy;&dcy;&ucy;&tcy; &scy;&iecy;&bcy;&yacy; &pcy;&ocy;-&rcy;&acy;&zcy;&ncy;&ocy;&mcy;&ucy;, &icy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &pcy;&iecy;&rcy;&vcy;&ocy;&gcy;&ocy; &pcy;&rcy;&icy;&ncy;&icy;&mcy;&acy;&iecy;&tcy;&scy;&yacy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;, &pcy;&rcy;&icy;&dcy;&acy;&yucy;&shchcy;&icy;&jcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&mcy;&ucy; &bcy;&ocy;&lcy;&iecy;&iecy; &ucy;&dcy;&ocy;&bcy;&ncy;&ucy;&yucy; &fcy;&ocy;&rcy;&mcy;&ucy;. &Ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&icy;&iecy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &vcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy; &icy;&lcy;&icy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&acy;&iecy;&tcy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy; &scy; &ncy;&iecy;&ncy;&ucy;&lcy;&iecy;&vcy;&ycy;&mcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;&ocy;&mcy;, &ncy;&iecy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &ocy;&shcy;&icy;&bcy;&kcy;&ocy;&jcy;, &ncy;&ocy; &dcy;&iecy;&lcy;&acy;&iecy;&tcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &ncy;&iecy;&rcy;&acy;&bcy;&ocy;&tcy;&acy;&yucy;&shchcy;&icy;&mcy;.</span></p> <p><span data-i18n="39e9f1d15fbe314e2866bf1622477ffaabceeb2949f464a395546571dcdf63e1/d7" data-source="You can declare that a filter turns a content that by itself is unusable into a usable content by setting the filter.&amp;lt;driver&amp;gt;.required configuration variable to &lt;code&gt;true&lt;/code&gt;." onmousemove="i18n(this)">&Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ocy;&bcy;&hardcy;&yacy;&vcy;&icy;&tcy;&softcy;, &chcy;&tcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &pcy;&rcy;&iecy;&vcy;&rcy;&acy;&shchcy;&acy;&iecy;&tcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &scy;&acy;&mcy; &pcy;&ocy; &scy;&iecy;&bcy;&iecy; &ncy;&iecy;&pcy;&rcy;&icy;&gcy;&ocy;&dcy;&iecy;&ncy; &dcy;&lcy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;, &vcy; &pcy;&ocy;&lcy;&iecy;&zcy;&ncy;&ycy;&jcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;, &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&vcy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy; filter.&lt;driver&gt;.required &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;  <code>true</code>  .</span></p> <p><span data-i18n="a420053ffa8d3b6e29515d6f1454ff2f74a4280656f19ce02fda1f109bcac7f9/0e" data-source="Note: Whenever the clean filter is changed, the repo should be renormalized: $ git add --renormalize ." onmousemove="i18n(this)">&Pcy;&rcy;&icy;&mcy;&iecy;&chcy;&acy;&ncy;&icy;&iecy;. &Pcy;&rcy;&icy; &kcy;&acy;&zhcy;&dcy;&ocy;&mcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&icy; &chcy;&icy;&scy;&tcy;&ocy;&gcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&jcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &pcy;&iecy;&rcy;&iecy;&ncy;&ocy;&rcy;&mcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;: $  git  add --renormalize .</span></p> <p><span data-i18n="e4fd668a1dc72a06923f0cb79391a960e846818b4764191d631cd8696428d1d1/ee" data-source="For example, in .gitattributes, you would assign the &lt;code&gt;filter&lt;/code&gt; attribute for paths." onmousemove="i18n(this)">&Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &vcy; .gitattributes &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ncy;&acy;&zcy;&ncy;&acy;&chcy;&icy;&tcy;&softcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>filter</code>  &dcy;&lcy;&yacy; &pcy;&ucy;&tcy;&iecy;&jcy;.</span></p> <div> <div> <pre class="hljs language-python">*.c        <span class="hljs-built_in">filter</span>=indent</pre> </div> </div> <p><span data-i18n="c25357fde0edbc0b90fa5462a605c4b0145a22fb38d405bcc188ff13094e89db/9f" data-source="Then you would define a &amp;quot;filter.indent.clean&amp;quot; and &amp;quot;filter.indent.smudge&amp;quot; configuration in your .git/config to specify a pair of commands to modify the contents of C programs when the source files are checked in (&amp;quot;clean&amp;quot; is run) and checked out (no change is made because the command is &amp;quot;cat&amp;quot;)." onmousemove="i18n(this)">&Zcy;&acy;&tcy;&iecy;&mcy; &vcy;&ycy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  &quot;filter.indent.clean&quot;  &icy;  &quot;filter.indent.smudge&quot;  &vcy; &vcy;&acy;&shcy;&iecy;&mcy; .git/config, &chcy;&tcy;&ocy;&bcy;&ycy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &pcy;&acy;&rcy;&ucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy; &dcy;&lcy;&yacy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy; C, &kcy;&ocy;&gcy;&dcy;&acy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&shchcy;&acy;&yucy;&tcy;&scy;&yacy; (&zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&iecy;&tcy;&scy;&yacy;  &quot;clean&quot; ) &icy; &icy;&zcy;&vcy;&lcy;&iecy;&kcy;&acy;&yucy;&tcy;&scy;&yacy; (&ncy;&icy;&kcy;&acy;&kcy;&icy;&khcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; &ncy;&iecy; &pcy;&rcy;&ocy;&icy;&scy;&khcy;&ocy;&dcy;&icy;&tcy;, &pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &mdash;  &quot;cat&quot; ).</span></p> <div> <div> <pre class="hljs language-ini"><span class="hljs-section">[filter &quot;indent&quot;]</span>
        <span class="hljs-attr">clean</span> = indent
        <span class="hljs-attr">smudge</span> = cat</pre> </div> </div> <p><span data-i18n="421d9999c01abf736db1bd19da81473ae647d84a314abab6232012ce18c3f4cc/91" data-source="For best results, &lt;code&gt;clean&lt;/code&gt; should not alter its output further if it is run twice (&amp;quot;clean&amp;rarr;clean&amp;quot; should be equivalent to &amp;quot;clean&amp;quot;), and multiple &lt;code&gt;smudge&lt;/code&gt; commands should not alter &lt;code&gt;clean&lt;/code&gt;&amp;apos;s output (&amp;quot;smudge&amp;rarr;smudge&amp;rarr;clean&amp;quot; should be equivalent to &amp;quot;clean&amp;quot;). See the section on merging below." onmousemove="i18n(this)">&Dcy;&lcy;&yacy; &dcy;&ocy;&scy;&tcy;&icy;&zhcy;&iecy;&ncy;&icy;&yacy; &ncy;&acy;&icy;&lcy;&ucy;&chcy;&shcy;&icy;&khcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&ocy;&vcy;  <code>clean</code>  &ncy;&iecy; &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &icy;&zcy;&mcy;&iecy;&ncy;&yacy;&tcy;&softcy; &scy;&vcy;&ocy;&icy; &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ycy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy;, &iecy;&scy;&lcy;&icy; &ocy;&ncy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&iecy;&tcy;&scy;&yacy; &dcy;&vcy;&acy;&zhcy;&dcy;&ycy; ( &quot;clean&rarr;clean&quot;  &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &bcy;&ycy;&tcy;&softcy; &ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&iecy;&ncy;  &quot;clean&quot; ), &acy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;  <code>smudge</code>  &ncy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &icy;&zcy;&mcy;&iecy;&ncy;&yacy;&tcy;&softcy; &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ycy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy;  <code>clean</code>  ( &quot;smudge&rarr;smudge&rarr;clean&quot;  &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &bcy;&ycy;&tcy;&softcy; &ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&ncy;&ycy;  &quot;clean&quot; ). &Scy;&mcy;. &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &ocy;&bcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&icy; &ncy;&icy;&zhcy;&iecy;.</span></p> <p><span data-i18n="b372663de76d04db4779bdee39a7333447edfd495103611075460b1d99db3c5b/5d" data-source="The &amp;quot;indent&amp;quot; filter is well-behaved in this regard: it will not modify input that is already correctly indented. In this case, the lack of a smudge filter means that the clean filter &lt;code&gt;must&lt;/code&gt; accept its own output without modifying it." onmousemove="i18n(this)">&Fcy;&icy;&lcy;&softcy;&tcy;&rcy;  &quot;indent&quot;  &vcy; &ecy;&tcy;&ocy;&mcy; &ocy;&tcy;&ncy;&ocy;&shcy;&iecy;&ncy;&icy;&icy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&iecy;&tcy; &khcy;&ocy;&rcy;&ocy;&shcy;&ocy;: &ocy;&ncy; &ncy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&zcy;&mcy;&iecy;&ncy;&yacy;&tcy;&softcy; &vcy;&khcy;&ocy;&dcy;&ncy;&ycy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ucy;&zhcy;&iecy; &icy;&mcy;&iecy;&yucy;&tcy; &pcy;&rcy;&acy;&vcy;&icy;&lcy;&softcy;&ncy;&ycy;&jcy; &ocy;&tcy;&scy;&tcy;&ucy;&pcy;. &Vcy; &ecy;&tcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&icy;&iecy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &zcy;&acy;&gcy;&rcy;&yacy;&zcy;&ncy;&iecy;&ncy;&icy;&yacy; &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &chcy;&icy;&scy;&tcy;&ycy;&jcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;  <code>must</code>  &pcy;&rcy;&icy;&ncy;&icy;&mcy;&acy;&iecy;&tcy; &scy;&ocy;&bcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&jcy; &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ocy;&jcy; &scy;&icy;&gcy;&ncy;&acy;&lcy;, &ncy;&iecy; &icy;&zcy;&mcy;&iecy;&ncy;&yacy;&yacy; &iecy;&gcy;&ocy;.</span></p> <p><span data-i18n="0e9ce034081ebfc68e07fec843a538e424452ec254a605ed04e80ffa260d34bf/68" data-source="If a filter &lt;code&gt;must&lt;/code&gt; succeed in order to make the stored contents usable, you can declare that the filter is &lt;code&gt;required&lt;/code&gt;, in the configuration:" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&ucy;  <code>must</code>  &ucy;&dcy;&acy;&lcy;&ocy;&scy;&softcy; &scy;&dcy;&iecy;&lcy;&acy;&tcy;&softcy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&iecy;&ncy;&ncy;&ocy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &pcy;&rcy;&icy;&gcy;&ocy;&dcy;&ncy;&ycy;&mcy; &dcy;&lcy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ocy;&bcy;&hardcy;&yacy;&vcy;&icy;&tcy;&softcy;, &chcy;&tcy;&ocy; &ecy;&tcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;  <code>required</code> , &vcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;:</span></p> <div> <div> <pre class="hljs language-csharp">[<span class="hljs-meta">filter <span class="hljs-string">&quot;crypt&quot;</span></span>]
        clean = openssl enc ...
        smudge = openssl enc -d ...
        required</pre> </div> </div> <p><span data-i18n="6b86191315386b7dba8a1227e0dc512683b6c772cc70cea24e4da62d57ad75fe/5d" data-source="Sequence &amp;quot;%f&amp;quot; on the filter command line is replaced with the name of the file the filter is working on. A filter might use this in keyword substitution. For example:" onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&scy;&tcy;&softcy;  &quot;%f&quot;  &vcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&iecy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &zcy;&acy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &icy;&mcy;&iecy;&ncy;&iecy;&mcy; &fcy;&acy;&jcy;&lcy;&acy;, &ncy;&acy;&dcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&iecy;&tcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;. &Fcy;&icy;&lcy;&softcy;&tcy;&rcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &ecy;&tcy;&ocy; &pcy;&rcy;&icy; &zcy;&acy;&mcy;&iecy;&ncy;&iecy; &kcy;&lcy;&yucy;&chcy;&iecy;&vcy;&ycy;&khcy; &scy;&lcy;&ocy;&vcy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;:</span></p> <div> <div> <pre class="hljs language-sql">[<span class="hljs-keyword">filter</span> &quot;p4&quot;]
        clean <span class="hljs-operator">=</span> git<span class="hljs-operator">-</span>p4<span class="hljs-operator">-</span><span class="hljs-keyword">filter</span> <span class="hljs-comment">--clean %f</span>
        smudge <span class="hljs-operator">=</span> git<span class="hljs-operator">-</span>p4<span class="hljs-operator">-</span><span class="hljs-keyword">filter</span> <span class="hljs-comment">--smudge %f</span></pre> </div> </div> <p><span data-i18n="1f8501d75b3da044b16d51c6bf5678bc19f4c6c75e5d7b2333c78c5c2f97c3c0/5f" data-source="Note that &amp;quot;%f&amp;quot; is the name of the path that is being worked on. Depending on the version that is being filtered, the corresponding file on disk may not exist, or may have different contents. So, smudge and clean commands should not try to access the file on disk, but only act as filters on the content provided to them on standard input." onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy;  &quot;%f&quot;  &mdash; &ecy;&tcy;&ocy; &icy;&mcy;&yacy; &pcy;&ucy;&tcy;&icy;, &ncy;&acy;&dcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &vcy;&iecy;&dcy;&iecy;&tcy;&scy;&yacy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;. &Vcy; &zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &ocy;&tcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&ucy;&iecy;&mcy;&ocy;&jcy; &vcy;&iecy;&rcy;&scy;&icy;&icy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&jcy; &fcy;&acy;&jcy;&lcy; &ncy;&acy; &dcy;&icy;&scy;&kcy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&tcy;&softcy; &icy;&lcy;&icy; &icy;&mcy;&iecy;&tcy;&softcy; &dcy;&rcy;&ucy;&gcy;&ocy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy;. &Tcy;&acy;&kcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;, &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy; smudge &icy; clean &ncy;&iecy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &pcy;&ycy;&tcy;&acy;&tcy;&softcy;&scy;&yacy; &pcy;&ocy;&lcy;&ucy;&chcy;&icy;&tcy;&softcy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy; &kcy; &fcy;&acy;&jcy;&lcy;&ucy; &ncy;&acy; &dcy;&icy;&scy;&kcy;&iecy;, &acy; &lcy;&icy;&shcy;&softcy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&ocy;&vcy;&acy;&tcy;&softcy; &kcy;&acy;&kcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&ycy; &dcy;&lcy;&yacy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy;, &pcy;&rcy;&iecy;&dcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&mcy;&ocy;&gcy;&ocy; &icy;&mcy; &ncy;&acy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ocy;&mcy; &vcy;&vcy;&ocy;&dcy;&iecy;.</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_long_running_filter_process"><span data-i18n="df383d9d2c1c0df6784c2389abc10040996201403b8a5f5f04b5df6e16d5df5d/d5" data-source="Long Running Filter Process" onmousemove="i18n(this)">&Dcy;&lcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&jcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;&tscy;&icy;&icy;</span></h4> <p><span data-i18n="66b0c21589f9698535a036de06c7a8f32636bf61e0d06ac875c54447d551943b/d5" data-source="If the filter command (a string value) is defined via &lt;code&gt;filter.&amp;lt;driver&amp;gt;.process&lt;/code&gt; then Git can process all blobs with a single filter invocation for the entire life of a single Git command. This is achieved by using the long-running process protocol (described in technical/long-running-process-protocol.txt)." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&acy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; (&scy;&tcy;&rcy;&ocy;&kcy;&ocy;&vcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;) &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&acy; &chcy;&iecy;&rcy;&iecy;&zcy;  <code>filter.&lt;driver&gt;.process</code> , &tcy;&ocy;  Git  &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &vcy;&scy;&iecy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&iecy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ycy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &vcy;&ycy;&zcy;&ocy;&vcy;&acy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &vcy; &tcy;&iecy;&chcy;&iecy;&ncy;&icy;&iecy; &vcy;&scy;&iecy;&gcy;&ocy; &scy;&rcy;&ocy;&kcy;&acy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&yacy; &ocy;&dcy;&ncy;&ocy;&jcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy;  Git . &Ecy;&tcy;&ocy; &dcy;&ocy;&scy;&tcy;&icy;&gcy;&acy;&iecy;&tcy;&scy;&yacy; &zcy;&acy; &scy;&chcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &pcy;&rcy;&ocy;&tcy;&ocy;&kcy;&ocy;&lcy;&acy; &dcy;&lcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy;&acy; (&ocy;&pcy;&icy;&scy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy;technic/long-running-process-protocol.txt).</span></p> <p><span data-i18n="c738d6b6f4cec23cbeee52456cf66c28cbf57608e266abd5c47d85f79123078e/1c" data-source="When Git encounters the first file that needs to be cleaned or smudged, it starts the filter and performs the handshake. In the handshake, the welcome message sent by Git is &amp;quot;git-filter-client&amp;quot;, only version 2 is supported, and the supported capabilities are &amp;quot;clean&amp;quot;, &amp;quot;smudge&amp;quot;, and &amp;quot;delay&amp;quot;." onmousemove="i18n(this)">&Kcy;&ocy;&gcy;&dcy;&acy;  Git  &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy; &pcy;&iecy;&rcy;&vcy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy; &ocy;&chcy;&icy;&scy;&tcy;&icy;&tcy;&softcy; &icy;&lcy;&icy; &scy;&tcy;&iecy;&rcy;&iecy;&tcy;&softcy;, &ocy;&ncy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&iecy;&tcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &icy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&iecy;&tcy; &pcy;&ocy;&dcy;&tcy;&vcy;&iecy;&rcy;&zhcy;&dcy;&iecy;&ncy;&icy;&iecy; &scy;&vcy;&yacy;&zcy;&icy;. &Pcy;&rcy;&icy; &rcy;&ucy;&kcy;&ocy;&pcy;&ocy;&zhcy;&acy;&tcy;&icy;&icy; &pcy;&rcy;&icy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ocy;&iecy; &scy;&ocy;&ocy;&bcy;&shchcy;&iecy;&ncy;&icy;&iecy;, &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&ncy;&ocy;&iecy;  Git , &mdash;  &quot;git-filter-client&quot; , &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &vcy;&iecy;&rcy;&scy;&icy;&yacy; 2, &acy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&mcy;&ycy;&iecy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&icy; &mdash;  &quot;clean&quot; ,  &quot;smudge&quot;  &icy;  &quot;delay&quot; .</span></p> <p><span data-i18n="19f7de33e420bcc41900559df6a2fd85f89b4702a7b0aa34580bcc34423d20c5/fe" data-source="Afterwards Git sends a list of &amp;quot;key=value&amp;quot; pairs terminated with a flush packet. The list will contain at least the filter command (based on the supported capabilities) and the pathname of the file to filter relative to the repository root. Right after the flush packet Git sends the content split in zero or more pkt-line packets and a flush packet to terminate content. Please note, that the filter must not send any response before it received the content and the final flush packet. Also note that the &amp;quot;value&amp;quot; of a &amp;quot;key=value&amp;quot; pair can contain the &amp;quot;=&amp;quot; character whereas the key would never contain that character." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &ecy;&tcy;&ocy;&gcy;&ocy;  Git  &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &pcy;&acy;&rcy;  &quot;key=value&quot; , &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&acy;&yucy;&shchcy;&icy;&jcy;&scy;&yacy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&mcy; &scy;&bcy;&rcy;&ocy;&scy;&acy;. &Scy;&pcy;&icy;&scy;&ocy;&kcy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy;&softcy; &kcy;&acy;&kcy; &mcy;&icy;&ncy;&icy;&mcy;&ucy;&mcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; (&vcy; &zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &ocy;&tcy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&mcy;&ycy;&khcy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&iecy;&jcy;) &icy; &pcy;&ucy;&tcy;&softcy; &kcy; &fcy;&acy;&jcy;&lcy;&ucy; &dcy;&lcy;&yacy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;&tscy;&icy;&icy; &ocy;&tcy;&ncy;&ocy;&scy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &kcy;&ocy;&rcy;&ncy;&yacy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&yacy;. &Scy;&rcy;&acy;&zcy;&ucy; &pcy;&ocy;&scy;&lcy;&iecy; &pcy;&acy;&kcy;&iecy;&tcy;&acy; &ocy;&chcy;&icy;&scy;&tcy;&kcy;&icy;  Git  &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;, &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&jcy; &ncy;&acy; &ncy;&ocy;&lcy;&softcy; &icy;&lcy;&icy; &bcy;&ocy;&lcy;&iecy;&iecy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&vcy; pkt-line, &acy; &tcy;&acy;&kcy;&zhcy;&iecy; &pcy;&acy;&kcy;&iecy;&tcy; &ocy;&chcy;&icy;&scy;&tcy;&kcy;&icy; &dcy;&lcy;&yacy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&iecy;&ncy;&icy;&yacy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy;. &Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &ncy;&iecy; &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&tcy;&softcy; &kcy;&acy;&kcy;&ocy;&jcy;-&lcy;&icy;&bcy;&ocy; &ocy;&tcy;&vcy;&iecy;&tcy; &dcy;&ocy; &tcy;&ocy;&gcy;&ocy;, &kcy;&acy;&kcy; &ocy;&ncy; &pcy;&ocy;&lcy;&ucy;&chcy;&icy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &icy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&icy;&jcy; &pcy;&acy;&kcy;&iecy;&tcy; &scy;&bcy;&rcy;&ocy;&scy;&acy;. &Tcy;&acy;&kcy;&zhcy;&iecy; &ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy;  &quot;value&quot;  &pcy;&acy;&rcy;&ycy;  &quot;key=value&quot;  &mcy;&ocy;&zhcy;&iecy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy;&softcy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;  &quot;=&quot; , &tcy;&ocy;&gcy;&dcy;&acy; &kcy;&acy;&kcy; &kcy;&lcy;&yucy;&chcy; &ncy;&icy;&kcy;&ocy;&gcy;&dcy;&acy; &ncy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy;&softcy; &ecy;&tcy;&ocy;&tcy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;.</span></p> <div> <div> <pre class="hljs language-yaml"><span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-string">command=smudge</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-string">pathname=path/testfile.dat</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-string">CONTENT</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-number">0000</span></pre> </div> </div> <p><span data-i18n="ac0d70497619759e6d0164deaf2ff36c32c5f9cab430941310e4d04aa0fe7928/59" data-source="The filter is expected to respond with a list of &amp;quot;key=value&amp;quot; pairs terminated with a flush packet. If the filter does not experience problems then the list must contain a &amp;quot;success&amp;quot; status. Right after these packets the filter is expected to send the content in zero or more pkt-line packets and a flush packet at the end. Finally, a second list of &amp;quot;key=value&amp;quot; pairs terminated with a flush packet is expected. The filter can change the status in the second list or keep the status as is with an empty list. Please note that the empty list must be terminated with a flush packet regardless." onmousemove="i18n(this)">&Ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &ocy;&tcy;&vcy;&iecy;&tcy;&icy;&tcy; &scy;&pcy;&icy;&scy;&kcy;&ocy;&mcy; &pcy;&acy;&rcy;  &quot;key=value&quot; , &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&acy;&yucy;&shchcy;&icy;&mcy;&scy;&yacy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&mcy; &scy;&bcy;&rcy;&ocy;&scy;&acy;. &IEcy;&scy;&lcy;&icy; &scy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&ocy;&mcy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy; &ncy;&iecy;&tcy;, &scy;&pcy;&icy;&scy;&ocy;&kcy; &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy;&softcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;  &quot;success&quot; . &Ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &scy;&rcy;&acy;&zcy;&ucy; &pcy;&ocy;&scy;&lcy;&iecy; &ecy;&tcy;&icy;&khcy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&vcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&icy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &vcy; &vcy;&icy;&dcy;&iecy; &ncy;&ucy;&lcy;&yacy; &icy;&lcy;&icy; &bcy;&ocy;&lcy;&iecy;&iecy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&vcy; pkt-line &icy; &pcy;&acy;&kcy;&iecy;&tcy;&acy; &scy;&bcy;&rcy;&ocy;&scy;&acy; &vcy; &kcy;&ocy;&ncy;&tscy;&iecy;. &Ncy;&acy;&kcy;&ocy;&ncy;&iecy;&tscy;, &ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy;&tcy;&ocy;&rcy;&ocy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &pcy;&acy;&rcy;  &quot;key=value&quot; , &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&acy;&yucy;&shchcy;&icy;&jcy;&scy;&yacy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&mcy; &scy;&bcy;&rcy;&ocy;&scy;&acy;. &Fcy;&icy;&lcy;&softcy;&tcy;&rcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &icy;&zcy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy; &scy;&tcy;&acy;&tcy;&ucy;&scy; &vcy;&ocy; &vcy;&tcy;&ocy;&rcy;&ocy;&mcy; &scy;&pcy;&icy;&scy;&kcy;&iecy; &icy;&lcy;&icy; &ocy;&scy;&tcy;&acy;&vcy;&icy;&tcy;&softcy; &scy;&tcy;&acy;&tcy;&ucy;&scy; &kcy;&acy;&kcy; &iecy;&scy;&tcy;&softcy; &pcy;&rcy;&icy; &pcy;&ucy;&scy;&tcy;&ocy;&mcy; &scy;&pcy;&icy;&scy;&kcy;&iecy;. &Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &pcy;&ucy;&scy;&tcy;&ocy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &vcy; &lcy;&yucy;&bcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&acy;&tcy;&softcy;&scy;&yacy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&mcy; &scy;&bcy;&rcy;&ocy;&scy;&acy;.</span></p> <div> <div> <pre class="hljs language-yaml"><span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">status=success</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">SMUDGED_CONTENT</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>  <span class="hljs-comment"># empty list, keep &quot;status=success&quot; unchanged!</span></pre> </div> </div> <p><span data-i18n="e04a5c921e6092d0b505f8d4f4318d94c9f8073bb1ed4b125883e488a37219c7/81" data-source="If the result content is empty then the filter is expected to respond with a &amp;quot;success&amp;quot; status and a flush packet to signal the empty content." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&acy; &pcy;&ucy;&scy;&tcy;&ocy;, &tcy;&ocy; &ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &ocy;&tcy;&vcy;&iecy;&tcy;&icy;&tcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;&ocy;&mcy;  &quot;success&quot;  &icy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&mcy; &ocy;&chcy;&icy;&scy;&tcy;&kcy;&icy;, &scy;&icy;&gcy;&ncy;&acy;&lcy;&icy;&zcy;&icy;&rcy;&ucy;&yucy;&shchcy;&icy;&mcy; &ocy; &pcy;&ucy;&scy;&tcy;&ocy;&mcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&mcy;.</span></p> <div> <div> <pre class="hljs language-yaml"><span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">status=success</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>  <span class="hljs-comment"># empty content!</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>  <span class="hljs-comment"># empty list, keep &quot;status=success&quot; unchanged!</span></pre> </div> </div> <p><span data-i18n="1cab47ac33b84fe45e02e12ae190ff3a6c8c859455b429e020953ee3a0bb50d3/b1" data-source="In case the filter cannot or does not want to process the content, it is expected to respond with an &amp;quot;error&amp;quot; status." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &icy;&lcy;&icy; &ncy;&iecy; &khcy;&ocy;&chcy;&iecy;&tcy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;, &ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &ocy;&ncy; &ocy;&tcy;&vcy;&iecy;&tcy;&icy;&tcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;&ocy;&mcy;  &quot;error&quot; .</span></p> <div> <div> <pre class="hljs language-vbnet"><span class="hljs-symbol">packet:</span>          git&lt; status=<span class="hljs-keyword">error</span>
<span class="hljs-symbol">packet:</span>          git&lt; <span class="hljs-number">0000</span></pre> </div> </div> <p><span data-i18n="da9e6a54bba6c932389e9f331aa608597bf8386a784a65456675c628c2e0e484/6c" data-source="If the filter experiences an error during processing, then it can send the status &amp;quot;error&amp;quot; after the content was (partially or completely) sent." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &ocy;&bcy;&rcy;&acy;&bcy;&ocy;&tcy;&kcy;&icy; &vcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&iecy; &vcy;&ocy;&zcy;&ncy;&icy;&kcy;&acy;&iecy;&tcy; &ocy;&shcy;&icy;&bcy;&kcy;&acy;, &ocy;&ncy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&icy;&tcy;&softcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;  &quot;error&quot;  &pcy;&ocy;&scy;&lcy;&iecy; &tcy;&ocy;&gcy;&ocy;, &kcy;&acy;&kcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy; &bcy;&ycy;&lcy; (&chcy;&acy;&scy;&tcy;&icy;&chcy;&ncy;&ocy; &icy;&lcy;&icy; &pcy;&ocy;&lcy;&ncy;&ocy;&scy;&tcy;&softcy;&yucy;) &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;.</span></p> <div> <div> <pre class="hljs language-yaml"><span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">status=success</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">HALF_WRITTEN_ERRONEOUS_CONTENT</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">status=error</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span></pre> </div> </div> <p><span data-i18n="99d0265645de1d85a6433ed297db83d4c9f5f19f8a0864d15820180e29898122/5c" data-source="In case the filter cannot or does not want to process the content as well as any future content for the lifetime of the Git process, then it is expected to respond with an &amp;quot;abort&amp;quot; status at any point in the protocol." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &icy;&lcy;&icy; &ncy;&iecy; &khcy;&ocy;&chcy;&iecy;&tcy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;, &acy; &tcy;&acy;&kcy;&zhcy;&iecy; &lcy;&yucy;&bcy;&ocy;&jcy; &bcy;&ucy;&dcy;&ucy;&shchcy;&icy;&jcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy; &vcy; &tcy;&iecy;&chcy;&iecy;&ncy;&icy;&iecy; &vcy;&scy;&iecy;&gcy;&ocy; &scy;&rcy;&ocy;&kcy;&acy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&yacy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy;&acy;  Git , &ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &ocy;&ncy; &ocy;&tcy;&vcy;&iecy;&tcy;&icy;&tcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;&ocy;&mcy;  &quot;abort&quot;  &vcy; &lcy;&yucy;&bcy;&ocy;&jcy; &tcy;&ocy;&chcy;&kcy;&iecy; &pcy;&rcy;&ocy;&tcy;&ocy;&kcy;&ocy;&lcy;&acy;.</span></p> <div> <div> <pre class="hljs language-yaml"><span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">status=abort</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span></pre> </div> </div> <p><span data-i18n="40d7a4d977647b4d9e0053c0118455f89652447caa1c7019c85ee895ae01ab6c/5f" data-source="Git neither stops nor restarts the filter process in case the &amp;quot;error&amp;quot;/&amp;quot;abort&amp;quot; status is set. However, Git sets its exit code according to the &lt;code&gt;filter.&amp;lt;driver&amp;gt;.required&lt;/code&gt; flag, mimicking the behavior of the &lt;code&gt;filter.&amp;lt;driver&amp;gt;.clean&lt;/code&gt; / &lt;code&gt;filter.&amp;lt;driver&amp;gt;.smudge&lt;/code&gt; mechanism." onmousemove="i18n(this)">Git  &ncy;&iecy; &ocy;&scy;&tcy;&acy;&ncy;&acy;&vcy;&lcy;&icy;&vcy;&acy;&iecy;&tcy; &icy; &ncy;&iecy; &pcy;&iecy;&rcy;&iecy;&zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&iecy;&tcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;&tscy;&icy;&icy;, &iecy;&scy;&lcy;&icy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &scy;&tcy;&acy;&tcy;&ucy;&scy;  &quot;error&quot; / &quot;abort&quot; . &Ocy;&dcy;&ncy;&acy;&kcy;&ocy;  Git  &ucy;&scy;&tcy;&acy;&ncy;&acy;&vcy;&lcy;&icy;&vcy;&acy;&iecy;&tcy; &scy;&vcy;&ocy;&jcy; &kcy;&ocy;&dcy; &vcy;&ycy;&khcy;&ocy;&dcy;&acy; &vcy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&icy;&icy; &scy; &fcy;&lcy;&acy;&gcy;&ocy;&mcy;  <code>filter.&lt;driver&gt;.required</code> , &icy;&mcy;&icy;&tcy;&icy;&rcy;&ucy;&yacy; &pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&iecy; &mcy;&iecy;&khcy;&acy;&ncy;&icy;&zcy;&mcy;&acy;  <code>filter.&lt;driver&gt;.clean</code> / <code>filter.&lt;driver&gt;.smudge</code> .</span></p> <p><span data-i18n="ad6cc533e7fbfe0b1bfe311a73ce5b00ae1ad44a77ea5e810854f34bf430c62b/bb" data-source="If the filter dies during the communication or does not adhere to the protocol then Git will stop the filter process and restart it with the next file that needs to be processed. Depending on the &lt;code&gt;filter.&amp;lt;driver&amp;gt;.required&lt;/code&gt; flag Git will interpret that as error." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &vcy;&ycy;&khcy;&ocy;&dcy;&icy;&tcy; &icy;&zcy; &scy;&tcy;&rcy;&ocy;&yacy; &vcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &scy;&vcy;&yacy;&zcy;&icy; &icy;&lcy;&icy; &ncy;&iecy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &pcy;&rcy;&ocy;&tcy;&ocy;&kcy;&ocy;&lcy;&ucy;,  Git  &ocy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;&tscy;&icy;&icy; &icy; &pcy;&iecy;&rcy;&iecy;&zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy; &iecy;&gcy;&ocy; &scy;&ocy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy; &fcy;&acy;&jcy;&lcy;&ocy;&mcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy; &ocy;&bcy;&rcy;&acy;&bcy;&ocy;&tcy;&acy;&tcy;&softcy;. &Vcy; &zcy;&acy;&vcy;&icy;&scy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &ocy;&tcy; &fcy;&lcy;&acy;&gcy;&acy;  <code>filter.&lt;driver&gt;.required</code>   Git  &icy;&ncy;&tcy;&iecy;&rcy;&pcy;&rcy;&iecy;&tcy;&icy;&rcy;&ucy;&iecy;&tcy; &ecy;&tcy;&ocy; &kcy;&acy;&kcy; &ocy;&shcy;&icy;&bcy;&kcy;&ucy;.</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_delay"><span data-i18n="fd9b6df3cdbc3d35b9a3e634d9ecba3765eaadb9abe4bf13c20cf8df089b8a48/11" data-source="Delay" onmousemove="i18n(this)">Delay</span></h4> <p><span data-i18n="6f1a6da7453f9e8612280e33764678ed1621a3a1ed2598115a86ae9acc314a2e/66" data-source="If the filter supports the &amp;quot;delay&amp;quot; capability, then Git can send the flag &amp;quot;can-delay&amp;quot; after the filter command and pathname. This flag denotes that the filter can delay filtering the current blob (e.g. to compensate network latencies) by responding with no content but with the status &amp;quot;delayed&amp;quot; and a flush packet." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy;  &quot;delay&quot; , &tcy;&ocy;  Git  &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&icy;&tcy;&softcy; &fcy;&lcy;&acy;&gcy;  &quot;can-delay&quot;  &pcy;&ocy;&scy;&lcy;&iecy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &icy; &icy;&mcy;&iecy;&ncy;&icy; &pcy;&ucy;&tcy;&icy;. &Ecy;&tcy;&ocy;&tcy; &fcy;&lcy;&acy;&gcy; &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &zcy;&acy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy;&softcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;&tscy;&icy;&yucy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&gcy;&ocy; &bcy;&ocy;&lcy;&softcy;&shcy;&ocy;&gcy;&ocy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ocy;&gcy;&ocy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&acy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &dcy;&lcy;&yacy; &kcy;&ocy;&mcy;&pcy;&iecy;&ncy;&scy;&acy;&tscy;&icy;&icy; &zcy;&acy;&dcy;&iecy;&rcy;&zhcy;&iecy;&kcy; &vcy; &scy;&iecy;&tcy;&icy;), &ocy;&tcy;&vcy;&iecy;&tcy;&icy;&vcy; &bcy;&iecy;&zcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy;, &ncy;&ocy; &scy;&ocy; &scy;&tcy;&acy;&tcy;&ucy;&scy;&ocy;&mcy;  &quot;delayed&quot;  &icy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&mcy; &scy;&bcy;&rcy;&ocy;&scy;&acy;.</span></p> <div> <div> <pre class="hljs language-yaml"><span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-string">command=smudge</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-string">pathname=path/testfile.dat</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-string">can-delay=1</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-string">CONTENT</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">status=delayed</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span></pre> </div> </div> <p><span data-i18n="6ced4256b797c16c9982cb2191759c0c426fcb52b4f8debf42740aeed18c4682/c2" data-source="If the filter supports the &amp;quot;delay&amp;quot; capability then it must support the &amp;quot;list_available_blobs&amp;quot; command. If Git sends this command, then the filter is expected to return a list of pathnames representing blobs that have been delayed earlier and are now available. The list must be terminated with a flush packet followed by a &amp;quot;success&amp;quot; status that is also terminated with a flush packet. If no blobs for the delayed paths are available, yet, then the filter is expected to block the response until at least one blob becomes available. The filter can tell Git that it has no more delayed blobs by sending an empty list. As soon as the filter responds with an empty list, Git stops asking. All blobs that Git has not received at this point are considered missing and will result in an error." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&yucy;  &quot;delay&quot; , &ocy;&ncy; &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &pcy;&ocy;&dcy;&dcy;&iecy;&rcy;&zhcy;&icy;&vcy;&acy;&tcy;&softcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy;  &quot;list_available_blobs&quot; . &IEcy;&scy;&lcy;&icy;  Git  &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &ecy;&tcy;&ucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy;, &tcy;&ocy; &ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &vcy;&iecy;&rcy;&ncy;&iecy;&tcy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &icy;&mcy;&iecy;&ncy; &pcy;&ucy;&tcy;&iecy;&jcy;, &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&yucy;&shchcy;&icy;&khcy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&iecy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &bcy;&ycy;&lcy;&icy; &zcy;&acy;&dcy;&iecy;&rcy;&zhcy;&acy;&ncy;&ycy; &rcy;&acy;&ncy;&iecy;&iecy; &icy; &tcy;&iecy;&pcy;&iecy;&rcy;&softcy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy;. &Scy;&pcy;&icy;&scy;&ocy;&kcy; &dcy;&ocy;&lcy;&zhcy;&iecy;&ncy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&acy;&tcy;&softcy;&scy;&yacy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&mcy; &scy;&bcy;&rcy;&ocy;&scy;&acy;, &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;  &quot;success&quot; , &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &tcy;&acy;&kcy;&zhcy;&iecy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&acy;&iecy;&tcy;&scy;&yacy; &pcy;&acy;&kcy;&iecy;&tcy;&ocy;&mcy; &scy;&bcy;&rcy;&ocy;&scy;&acy;. &IEcy;&scy;&lcy;&icy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ycy; &dcy;&lcy;&yacy; &zcy;&acy;&dcy;&iecy;&rcy;&zhcy;&acy;&ncy;&ncy;&ycy;&khcy; &pcy;&ucy;&tcy;&iecy;&jcy; &iecy;&shchcy;&iecy; &ncy;&iecy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy;, &tcy;&ocy; &ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &bcy;&ucy;&dcy;&iecy;&tcy; &bcy;&lcy;&ocy;&kcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &ocy;&tcy;&vcy;&iecy;&tcy; &dcy;&ocy; &tcy;&iecy;&khcy; &pcy;&ocy;&rcy;, &pcy;&ocy;&kcy;&acy; &ncy;&iecy; &scy;&tcy;&acy;&ncy;&iecy;&tcy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&iecy;&ncy; &khcy;&ocy;&tcy;&yacy; &bcy;&ycy; &ocy;&dcy;&icy;&ncy; &bcy;&ocy;&lcy;&softcy;&shcy;&ocy;&jcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&jcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;. &Fcy;&icy;&lcy;&softcy;&tcy;&rcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &scy;&ocy;&ocy;&bcy;&shchcy;&icy;&tcy;&softcy;  Git , &chcy;&tcy;&ocy; &ucy; &ncy;&iecy;&gcy;&ocy; &bcy;&ocy;&lcy;&softcy;&shcy;&iecy; &ncy;&iecy;&tcy; &zcy;&acy;&dcy;&iecy;&rcy;&zhcy;&acy;&ncy;&ncy;&ycy;&khcy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&khcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&khcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ocy;&vcy;, &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&icy;&vcy; &pcy;&ucy;&scy;&tcy;&ocy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy;. &Kcy;&acy;&kcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &ocy;&tcy;&vcy;&iecy;&tcy;&icy;&tcy; &pcy;&ucy;&scy;&tcy;&ycy;&mcy; &scy;&pcy;&icy;&scy;&kcy;&ocy;&mcy;,  Git  &pcy;&iecy;&rcy;&iecy;&scy;&tcy;&acy;&ncy;&iecy;&tcy; &scy;&pcy;&rcy;&acy;&shcy;&icy;&vcy;&acy;&tcy;&softcy;. &Vcy;&scy;&iecy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&iecy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy;  Git  &ncy;&iecy; &pcy;&ocy;&lcy;&ucy;&chcy;&icy;&lcy; &ncy;&acy; &ecy;&tcy;&ocy;&mcy; &ecy;&tcy;&acy;&pcy;&iecy;, &scy;&chcy;&icy;&tcy;&acy;&yucy;&tcy;&scy;&yacy; &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&mcy;&icy; &icy; &pcy;&rcy;&icy;&vcy;&iecy;&dcy;&ucy;&tcy; &kcy; &ocy;&shcy;&icy;&bcy;&kcy;&iecy;.</span></p> <div> <div> <pre class="hljs language-yaml"><span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-string">command=list_available_blobs</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">pathname=path/testfile.dat</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">pathname=path/otherfile.dat</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">status=success</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span></pre> </div> </div> <p><span data-i18n="05a915cf016495cc658a24247afd32261fc70bacc4eab1485d4ffcc8a64bfad3/1b" data-source="After Git received the pathnames, it will request the corresponding blobs again. These requests contain a pathname and an empty content section. The filter is expected to respond with the smudged content in the usual way as explained above." onmousemove="i18n(this)">&Pcy;&ocy;&scy;&lcy;&iecy; &tcy;&ocy;&gcy;&ocy; &kcy;&acy;&kcy;  Git  &pcy;&ocy;&lcy;&ucy;&chcy;&icy;&lcy; &icy;&mcy;&iecy;&ncy;&acy; &pcy;&ucy;&tcy;&iecy;&jcy;, &ocy;&ncy; &scy;&ncy;&ocy;&vcy;&acy; &zcy;&acy;&pcy;&rcy;&ocy;&scy;&icy;&tcy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&iecy; BLOB-&ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ycy;. &Ecy;&tcy;&icy; &zcy;&acy;&pcy;&rcy;&ocy;&scy;&ycy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy; &pcy;&ucy;&tcy;&softcy; &icy; &pcy;&ucy;&scy;&tcy;&ocy;&jcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy;. &Ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; &ocy;&tcy;&rcy;&iecy;&acy;&gcy;&icy;&rcy;&ucy;&iecy;&tcy; &rcy;&acy;&zcy;&mcy;&ycy;&tcy;&ycy;&mcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ycy;&mcy; &ocy;&bcy;&ycy;&chcy;&ncy;&ycy;&mcy; &scy;&pcy;&ocy;&scy;&ocy;&bcy;&ocy;&mcy;, &kcy;&acy;&kcy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&ocy; &vcy;&ycy;&shcy;&iecy;.</span></p> <div> <div> <pre class="hljs language-yaml"><span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-string">command=smudge</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-string">pathname=path/testfile.dat</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&gt;</span> <span class="hljs-number">0000</span>  <span class="hljs-comment" title="# empty content!"># &pcy;&ucy;&scy;&tcy;&ocy;&jcy; &kcy;&ocy;&ncy;&tcy;&iecy;&ncy;&tcy;!</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">status=success</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-string">SMUDGED_CONTENT</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>
<span class="hljs-attr">packet:</span>          <span class="hljs-string">git&lt;</span> <span class="hljs-number">0000</span>  <span class="hljs-comment" title="# empty list, keep &quot;status=success&quot; unchanged!"># &pcy;&ucy;&scy;&tcy;&ocy;&jcy; &scy;&pcy;&icy;&scy;&ocy;&kcy;, &ocy;&scy;&tcy;&acy;&vcy;&softcy;&tcy;&iecy;  &quot;status=success&quot;  &bcy;&iecy;&zcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy;!</span></pre> </div> </div> </div> <div> <h4 class="text-body-emphasis"  id="_example"><span data-i18n="d029f87e3d80f8fd9b1be67c7426b4cc1ff47b4a9d0a8461c826a59d8c5eb6cd/91" data-source="Example" onmousemove="i18n(this)">Example</span></h4> <p><span data-i18n="afa21b196a26725ca96604aab2497928378de6f4dbd777edf475b5e4d031bc63/4b" data-source="A long running filter demo implementation can be found in &lt;code&gt;contrib/long-running-filter/example.pl&lt;/code&gt; located in the Git core repository. If you develop your own long running filter process then the &lt;code&gt;GIT_TRACE_PACKET&lt;/code&gt; environment variables can be very helpful for debugging (see &lt;a href=&quot;git&quot;&gt;git[1]&lt;/a&gt;)." onmousemove="i18n(this)">&Dcy;&acy;&vcy;&ncy;&ocy; &rcy;&acy;&bcy;&ocy;&tcy;&acy;&yucy;&shchcy;&ucy;&yucy; &dcy;&iecy;&mcy;&ocy;&ncy;&scy;&tcy;&rcy;&acy;&tscy;&icy;&ocy;&ncy;&ncy;&ucy;&yucy; &rcy;&iecy;&acy;&lcy;&icy;&zcy;&acy;&tscy;&icy;&yucy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &mcy;&ocy;&zhcy;&ncy;&ocy; &ncy;&acy;&jcy;&tcy;&icy; &vcy;  <code>contrib/long-running-filter/example.pl</code> , &rcy;&acy;&scy;&pcy;&ocy;&lcy;&ocy;&zhcy;&iecy;&ncy;&ncy;&ocy;&mcy; &vcy; &ocy;&scy;&ncy;&ocy;&vcy;&ncy;&ocy;&mcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy;  Git . &IEcy;&scy;&lcy;&icy; &vcy;&ycy; &rcy;&acy;&zcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy;&iecy; &scy;&vcy;&ocy;&jcy; &scy;&ocy;&bcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&jcy; &dcy;&lcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&jcy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;&tscy;&icy;&icy;, &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&iecy; &scy;&rcy;&iecy;&dcy;&ycy;  <code>GIT_TRACE_PACKET</code>  &mcy;&ocy;&gcy;&ucy;&tcy; &bcy;&ycy;&tcy;&softcy; &ocy;&chcy;&iecy;&ncy;&softcy; &pcy;&ocy;&lcy;&iecy;&zcy;&ncy;&ycy; &dcy;&lcy;&yacy; &ocy;&tcy;&lcy;&acy;&dcy;&kcy;&icy; (&scy;&mcy;.  <a href="git.html">git[1]</a> ).</span></p> <p><span data-i18n="b77adefaa5cd47672b9f155da39e193e807eabb6e8048eb29e0fd7d09cadf035/7b" data-source="Please note that you cannot use an existing &lt;code&gt;filter.&amp;lt;driver&amp;gt;.clean&lt;/code&gt; or &lt;code&gt;filter.&amp;lt;driver&amp;gt;.smudge&lt;/code&gt; command with &lt;code&gt;filter.&amp;lt;driver&amp;gt;.process&lt;/code&gt; because the former two use a different inter process communication protocol than the latter one." onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &vcy;&ycy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&ucy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy;  <code>filter.&lt;driver&gt;.clean</code>  &icy;&lcy;&icy;  <code>filter.&lt;driver&gt;.smudge</code>  &scy;  <code>filter.&lt;driver&gt;.process</code> , &pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &pcy;&iecy;&rcy;&vcy;&ycy;&iecy; &dcy;&vcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yucy;&tcy; &dcy;&rcy;&ucy;&gcy;&ocy;&jcy; &pcy;&rcy;&ocy;&tcy;&ocy;&kcy;&ocy;&lcy; &mcy;&iecy;&zhcy;&pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy;&ncy;&ocy;&gcy;&ocy; &vcy;&zcy;&acy;&icy;&mcy;&ocy;&dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&yacy;, &chcy;&iecy;&mcy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ncy;&icy;&jcy;.</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_interaction_between_checkincheckout_attributes"><span data-i18n="4f0a3bb3ca9a031c5f8d87270ed8dfdcd860d6b0b5267077cebde130a503d9b6/12" data-source="Interaction between checkin/checkout attributes" onmousemove="i18n(this)">&Vcy;&zcy;&acy;&icy;&mcy;&ocy;&dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&iecy; &mcy;&iecy;&zhcy;&dcy;&ucy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;&mcy;&icy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy;&acy; &icy; &ocy;&fcy;&ocy;&rcy;&mcy;&lcy;&iecy;&ncy;&icy;&yacy; &zcy;&acy;&kcy;&acy;&zcy;&acy;</span></h4> <p><span data-i18n="4a84447cdb11dc331663079794108d0362dced0402a62e727058be2ba40571b5/d9" data-source="In the check-in codepath, the worktree file is first converted with &lt;code&gt;filter&lt;/code&gt; driver (if specified and corresponding driver defined), then the result is processed with &lt;code&gt;ident&lt;/code&gt; (if specified), and then finally with &lt;code&gt;text&lt;/code&gt; (again, if specified and applicable)." onmousemove="i18n(this)">&Vcy; &kcy;&ocy;&dcy;&ocy;&vcy;&ocy;&mcy; &pcy;&ucy;&tcy;&icy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy;&acy; &fcy;&acy;&jcy;&lcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &scy;&ncy;&acy;&chcy;&acy;&lcy;&acy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy;  <code>filter</code>  (&iecy;&scy;&lcy;&icy; &ocy;&ncy; &ucy;&kcy;&acy;&zcy;&acy;&ncy; &icy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;), &zcy;&acy;&tcy;&iecy;&mcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>ident</code>  (&iecy;&scy;&lcy;&icy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;), &acy; &zcy;&acy;&tcy;&iecy;&mcy;, &ncy;&acy;&kcy;&ocy;&ncy;&iecy;&tscy;, &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>text</code>  (&ocy;&pcy;&yacy;&tcy;&softcy; &zhcy;&iecy;, &iecy;&scy;&lcy;&icy; &ocy;&ncy; &ucy;&kcy;&acy;&zcy;&acy;&ncy; &icy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&icy;&mcy;). .</span></p> <p><span data-i18n="83b5a47cbf8d3f1b387190ff6e79e02c72971f90886e576cad652610d8db2efb/03" data-source="In the check-out codepath, the blob content is first converted with &lt;code&gt;text&lt;/code&gt;, and then &lt;code&gt;ident&lt;/code&gt; and fed to &lt;code&gt;filter&lt;/code&gt;." onmousemove="i18n(this)">&Vcy; &kcy;&ocy;&dcy;&ocy;&vcy;&ocy;&mcy; &pcy;&ucy;&tcy;&icy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&kcy;&icy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&khcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&khcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ocy;&vcy; &scy;&ncy;&acy;&chcy;&acy;&lcy;&acy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>text</code> , &acy; &zcy;&acy;&tcy;&iecy;&mcy;  <code>ident</code>  &icy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy;  <code>filter</code> .</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_merging_branches_with_differing_checkincheckout_attributes"><span data-i18n="ae395820dd94346167ddbee24c2f4c81fc3c3ab5351da9ed07412d9e4528d225/c9" data-source="Merging branches with differing checkin/checkout attributes" onmousemove="i18n(this)">&Ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&iecy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy; &scy; &rcy;&acy;&zcy;&ncy;&ycy;&mcy;&icy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;&mcy;&icy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy;&acy;/&vcy;&ycy;&pcy;&icy;&scy;&kcy;&icy;</span></h4> <p><span data-i18n="0fb204145e6459dca83566392e0e2a11b5c90f1e08039be11bec82183b9ad593/ba" data-source="If you have added attributes to a file that cause the canonical repository format for that file to change, such as adding a clean/smudge filter or text/eol/ident attributes, merging anything where the attribute is not in place would normally cause merge conflicts." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &dcy;&ocy;&bcy;&acy;&vcy;&icy;&lcy;&icy; &vcy; &fcy;&acy;&jcy;&lcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&yacy;&tcy; &kcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yucy; &kcy;&acy;&ncy;&ocy;&ncy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&gcy;&ocy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&acy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&yacy; &dcy;&lcy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy; &ocy;&chcy;&icy;&scy;&tcy;&kcy;&icy;/&rcy;&acy;&zcy;&mcy;&acy;&zcy;&ycy;&vcy;&acy;&ncy;&icy;&yacy; &icy;&lcy;&icy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy; text/eol/ident, &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &vcy;&scy;&iecy;&gcy;&ocy;, &gcy;&dcy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &ocy;&tcy;&scy;&ucy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy;, &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;&mcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. .</span></p> <p><span data-i18n="28856b33a8a317fc4088f22ec357d7b01c451b49e2b8f0bd71039e18fc76344f/50" data-source="To prevent these unnecessary merge conflicts, Git can be told to run a virtual check-out and check-in of all three stages of a file when resolving a three-way merge by setting the &lt;code&gt;merge.renormalize&lt;/code&gt; configuration variable. This prevents changes caused by check-in conversion from causing spurious merge conflicts when a converted file is merged with an unconverted file." onmousemove="i18n(this)">&CHcy;&tcy;&ocy;&bcy;&ycy; &pcy;&rcy;&iecy;&dcy;&ocy;&tcy;&vcy;&rcy;&acy;&tcy;&icy;&tcy;&softcy; &ecy;&tcy;&icy; &ncy;&iecy;&ncy;&ucy;&zhcy;&ncy;&ycy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;,  Git  &mcy;&ocy;&zhcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&softcy; &vcy;&icy;&rcy;&tcy;&ucy;&acy;&lcy;&softcy;&ncy;&ocy;&iecy; &icy;&zcy;&vcy;&lcy;&iecy;&chcy;&iecy;&ncy;&icy;&iecy; &icy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy; &vcy;&scy;&iecy;&khcy; &tcy;&rcy;&iecy;&khcy; &ecy;&tcy;&acy;&pcy;&ocy;&vcy; &fcy;&acy;&jcy;&lcy;&acy; &pcy;&rcy;&icy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&iecy;&ncy;&icy;&icy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&vcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>merge.renormalize</code> . &Ecy;&tcy;&ocy; &pcy;&rcy;&iecy;&dcy;&ocy;&tcy;&vcy;&rcy;&acy;&shchcy;&acy;&iecy;&tcy; &vcy;&ocy;&zcy;&ncy;&icy;&kcy;&ncy;&ocy;&vcy;&iecy;&ncy;&icy;&iecy; &lcy;&ocy;&zhcy;&ncy;&ycy;&khcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ocy;&vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &vcy;&ycy;&zcy;&vcy;&acy;&ncy;&ncy;&ycy;&khcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;&mcy;&icy;, &vcy;&ycy;&zcy;&vcy;&acy;&ncy;&ncy;&ycy;&mcy;&icy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy;&ncy;&ycy;&mcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;&mcy;, &kcy;&ocy;&gcy;&dcy;&acy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &scy; &ncy;&iecy;&kcy;&ocy;&ncy;&vcy;&iecy;&rcy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&mcy; &fcy;&acy;&jcy;&lcy;&ocy;&mcy;.</span></p> <p><span data-i18n="b0d4abe747eee4c02bad6e325acea9440f213862df7598dbb279f6a0c9c98747/da" data-source="As long as a &amp;quot;smudge&amp;rarr;clean&amp;quot; results in the same output as a &amp;quot;clean&amp;quot; even on files that are already smudged, this strategy will automatically resolve all filter-related conflicts. Filters that do not act in this way may cause additional merge conflicts that must be resolved manually." onmousemove="i18n(this)">&Pcy;&ocy;&kcy;&acy;  &quot;smudge&rarr;clean&quot;  &dcy;&acy;&iecy;&tcy; &tcy;&ocy;&tcy; &zhcy;&iecy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;, &chcy;&tcy;&ocy; &icy;  &quot;clean&quot; , &dcy;&acy;&zhcy;&iecy; &dcy;&lcy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ucy;&zhcy;&iecy; &icy;&scy;&pcy;&acy;&chcy;&kcy;&acy;&ncy;&ycy;, &ecy;&tcy;&acy; &scy;&tcy;&rcy;&acy;&tcy;&iecy;&gcy;&icy;&yacy; &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&iecy;&tcy; &vcy;&scy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;, &scy;&vcy;&yacy;&zcy;&acy;&ncy;&ncy;&ycy;&iecy; &scy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&acy;&mcy;&icy;. &Fcy;&icy;&lcy;&softcy;&tcy;&rcy;&ycy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ncy;&iecy; &dcy;&iecy;&jcy;&scy;&tcy;&vcy;&ucy;&yucy;&tcy; &tcy;&acy;&kcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;, &mcy;&ocy;&gcy;&ucy;&tcy; &vcy;&ycy;&zcy;&vcy;&acy;&tcy;&softcy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&iecy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &pcy;&rcy;&icy;&dcy;&iecy;&tcy;&scy;&yacy; &rcy;&acy;&zcy;&rcy;&iecy;&shcy;&acy;&tcy;&softcy; &vcy;&rcy;&ucy;&chcy;&ncy;&ucy;&yucy;.</span></p> </div> </div> <div> <h3 class="text-body-emphasis"  id="_generating_diff_text"><span data-i18n="dc4e750720c95f88b180f9aaaf90eeb8329972da7e463cd8bdccb9f10e4b08bd/a4" data-source="Generating diff text" onmousemove="i18n(this)">&Gcy;&iecy;&ncy;&iecy;&rcy;&acy;&tscy;&icy;&yacy; &tcy;&iecy;&kcy;&scy;&tcy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;</span></h3> <div> <h4 class="text-body-emphasis"  id="_diff">
<code>diff</code>
</h4> <p><span data-i18n="32cf2cf92cddde4138e3723b243da580a84a1e35b0db5e7f0bc65557e5a5c203/b3" data-source="The attribute &lt;code&gt;diff&lt;/code&gt; affects how Git generates diffs for particular files. It can tell Git whether to generate a textual patch for the path or to treat the path as a binary file. It can also affect what line is shown on the hunk header &lt;code&gt;@@ -k,l +n,m @@&lt;/code&gt; line, tell Git to use an external command to generate the diff, or ask Git to convert binary files to a text format before generating the diff." onmousemove="i18n(this)">&Acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>diff</code>  &vcy;&lcy;&icy;&yacy;&iecy;&tcy; &ncy;&acy; &tcy;&ocy;, &kcy;&acy;&kcy;  Git  &gcy;&iecy;&ncy;&iecy;&rcy;&icy;&rcy;&ucy;&iecy;&tcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy; &dcy;&lcy;&yacy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;. &Ocy;&ncy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;  Git , &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &lcy;&icy; &gcy;&iecy;&ncy;&iecy;&rcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&jcy; &pcy;&acy;&tcy;&chcy; &dcy;&lcy;&yacy; &pcy;&ucy;&tcy;&icy; &icy;&lcy;&icy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&tcy;&softcy; &pcy;&ucy;&tcy;&softcy; &kcy;&acy;&kcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&jcy; &fcy;&acy;&jcy;&lcy;. &Ecy;&tcy;&ocy; &tcy;&acy;&kcy;&zhcy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&ocy;&vcy;&lcy;&icy;&yacy;&tcy;&softcy; &ncy;&acy; &tcy;&ocy;, &kcy;&acy;&kcy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy; &scy;&tcy;&rcy;&ocy;&kcy;&iecy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&kcy;&acy; &fcy;&rcy;&acy;&gcy;&mcy;&iecy;&ncy;&tcy;&acy;  <code>@@ -k,l +n,m @@</code> , &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;  Git  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &vcy;&ncy;&iecy;&shcy;&ncy;&yucy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy; &dcy;&lcy;&yacy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&yacy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy; &icy;&lcy;&icy; &pcy;&ocy;&pcy;&rcy;&ocy;&scy;&icy;&tcy;&softcy;  Git  &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; &vcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&jcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy; &pcy;&iecy;&rcy;&iecy;&dcy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&iecy;&mcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;.</span></p> <div> <dl> <dt id="Documentation/gitattributes.txt-Set-1-1"><span data-i18n="b6f6f3ad07b3c05fa0bbbbf2e3d257ff1e3e31a83efbe2c9369cd008594f94e0/14" data-source="Set" onmousemove="i18n(this)">Set</span></dt> <dd> <p><span data-i18n="acef50a3dd175ca980b642ade38557177f7fed0aa93bef7de1c178cfc96a0a15/1a" data-source="A path to which the &lt;code&gt;diff&lt;/code&gt; attribute is set is treated as text, even when they contain byte values that normally never appear in text files, such as NUL." onmousemove="i18n(this)">&Pcy;&ucy;&tcy;&softcy;, &dcy;&lcy;&yacy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&gcy;&ocy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>diff</code> , &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &tcy;&iecy;&kcy;&scy;&tcy;, &dcy;&acy;&zhcy;&iecy; &iecy;&scy;&lcy;&icy; &ocy;&ncy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &bcy;&acy;&jcy;&tcy;&ocy;&vcy;&ycy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &ncy;&icy;&kcy;&ocy;&gcy;&dcy;&acy; &ncy;&iecy; &pcy;&ocy;&yacy;&vcy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &vcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&acy;&khcy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy; NUL.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unset-1-1"><span data-i18n="8d2dd4e8c7caa1acb407c161aad48d1201e93e0f6dcf54c8f19ae6fb3fd15127/b7" data-source="Unset" onmousemove="i18n(this)">Unset</span></dt> <dd> <p><span data-i18n="72d26354b9d17d61eea25ee6ed4e0b9bfe60dd0a4cbeb6ac78161774382dbdbe/9b" data-source="A path to which the &lt;code&gt;diff&lt;/code&gt; attribute is unset will generate &lt;code&gt;Binary files differ&lt;/code&gt; (or a binary patch, if binary patches are enabled)." onmousemove="i18n(this)">&Pcy;&ucy;&tcy;&softcy;, &dcy;&lcy;&yacy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&gcy;&ocy; &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>diff</code> , &bcy;&ucy;&dcy;&iecy;&tcy; &gcy;&iecy;&ncy;&iecy;&rcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;  <code>Binary files differ</code>  (&icy;&lcy;&icy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ocy;&iecy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;, &iecy;&scy;&lcy;&icy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ycy;).</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unspecified-1-1-1"><span data-i18n="5b8aa0bf3c59daec38e2d0c690a1a62513208d1e2075dad62a32ca0b9440b1a1/dd" data-source="Unspecified" onmousemove="i18n(this)">Unspecified</span></dt> <dd> <p><span data-i18n="0eabe489b4770edba259d427f389115e15f570f4e42e80c894ba8cff536bfbdb/00" data-source="A path to which the &lt;code&gt;diff&lt;/code&gt; attribute is unspecified first gets its contents inspected, and if it looks like text and is smaller than core.bigFileThreshold, it is treated as text. Otherwise it would generate &lt;code&gt;Binary files differ&lt;/code&gt;." onmousemove="i18n(this)">&Pcy;&ucy;&tcy;&softcy;, &dcy;&lcy;&yacy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&gcy;&ocy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>diff</code>  &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;, &scy;&ncy;&acy;&chcy;&acy;&lcy;&acy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&yacy;&iecy;&tcy;&scy;&yacy; &iecy;&gcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy;, &icy; &iecy;&scy;&lcy;&icy; &ocy;&ncy; &vcy;&ycy;&gcy;&lcy;&yacy;&dcy;&icy;&tcy; &kcy;&acy;&kcy; &tcy;&iecy;&kcy;&scy;&tcy; &icy; &mcy;&iecy;&ncy;&softcy;&shcy;&iecy;, &chcy;&iecy;&mcy; core.bigFileThreshold, &ocy;&ncy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &tcy;&iecy;&kcy;&scy;&tcy;. &Vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&gcy;&iecy;&ncy;&iecy;&rcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;  <code>Binary files differ</code> .</span></p> </dd> <dt id="Documentation/gitattributes.txt-String"><span data-i18n="b2ef230e7f4f315a28cdcc863028da31f7110f3209feb76e76fed0f37b3d8580/47" data-source="String" onmousemove="i18n(this)">String</span></dt> <dd> <p><span data-i18n="0f9c8ec056336d1272c61257fa28436b245f1395f1d978cfbb23a626fba2b308/72" data-source="Diff is shown using the specified diff driver. Each driver may specify one or more options, as described in the following section. The options for the diff driver &amp;quot;foo&amp;quot; are defined by the configuration variables in the &amp;quot;diff.foo&amp;quot; section of the Git config file." onmousemove="i18n(this)">&Rcy;&acy;&zcy;&ncy;&icy;&tscy;&acy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;&mcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;. &Kcy;&acy;&zhcy;&dcy;&ycy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &ocy;&dcy;&ncy;&ucy; &icy;&lcy;&icy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &ocy;&pcy;&tscy;&icy;&jcy;, &kcy;&acy;&kcy; &ocy;&pcy;&icy;&scy;&acy;&ncy;&ocy; &vcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;. &Pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&ycy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;  &quot;foo&quot;  &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&mcy;&icy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy; &vcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;  &quot;diff.foo&quot;  &fcy;&acy;&jcy;&lcy;&acy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  Git .</span></p> </dd> </dl> </div> </div> <div> <h4 class="text-body-emphasis"  id="_defining_an_external_diff_driver"><span data-i18n="f4c3d84604ea6ef063d9364e6dad0b137165dceb1f9e688e1cd8494f009b2cd5/51" data-source="Defining an external diff driver" onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy; &vcy;&ncy;&iecy;&shcy;&ncy;&iecy;&gcy;&ocy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;</span></h4> <p><span data-i18n="a7f8b1019db357aa8b001bfc3a47e875d8e49f716c62087f055649fdc331dd4a/39" data-source="The definition of a diff driver is done in &lt;code&gt;gitconfig&lt;/code&gt;, not &lt;code&gt;gitattributes&lt;/code&gt; file, so strictly speaking this manual page is a wrong place to talk about it. However&amp;hellip;&amp;ZeroWidthSpace;" onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&ocy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy;  <code>gitconfig</code> , &acy; &ncy;&iecy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy;  <code>gitattributes</code> , &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy;, &scy;&tcy;&rcy;&ocy;&gcy;&ocy; &gcy;&ocy;&vcy;&ocy;&rcy;&yacy;, &ecy;&tcy;&acy; &scy;&tcy;&rcy;&acy;&ncy;&icy;&tscy;&acy; &rcy;&ucy;&kcy;&ocy;&vcy;&ocy;&dcy;&scy;&tcy;&vcy;&acy; &mdash; &ncy;&iecy;&pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&iecy; &mcy;&iecy;&scy;&tcy;&ocy; &dcy;&lcy;&yacy; &ocy;&bcy;&scy;&ucy;&zhcy;&dcy;&iecy;&ncy;&icy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &vcy;&ocy;&pcy;&rcy;&ocy;&scy;&acy;. &Ocy;&dcy;&ncy;&acy;&kcy;&ocy;&hellip;&ZeroWidthSpace;</span></p> <p><span data-i18n="21b5c1b755df66675c097eaf10bf7c4683073add28baaf481448324d0171e6cc/4c" data-source="To define an external diff driver &lt;code&gt;jcdiff&lt;/code&gt;, add a section to your &lt;code&gt;$GIT_DIR/config&lt;/code&gt; file (or &lt;code&gt;$HOME/.gitconfig&lt;/code&gt; file) like this:" onmousemove="i18n(this)">&CHcy;&tcy;&ocy;&bcy;&ycy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &vcy;&ncy;&iecy;&shcy;&ncy;&icy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;  <code>jcdiff</code> , &dcy;&ocy;&bcy;&acy;&vcy;&softcy;&tcy;&iecy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &vcy; &fcy;&acy;&jcy;&lcy;  <code>$GIT_DIR/config</code>  (&icy;&lcy;&icy; &fcy;&acy;&jcy;&lcy;  <code>$HOME/.gitconfig</code> ), &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;:</span></p> <div> <div> <pre class="hljs language-ini"><span class="hljs-section">[diff &quot;jcdiff&quot;]</span>
        <span class="hljs-attr">command</span> = j-c-diff</pre> </div> </div> <p><span data-i18n="efa4ceceed739a0a48aa14167d39285b4e50c4b4be8265d91d0d8fde2826e36e/87" data-source="When Git needs to show you a diff for the path with &lt;code&gt;diff&lt;/code&gt; attribute set to &lt;code&gt;jcdiff&lt;/code&gt;, it calls the command you specified with the above configuration, i.e. &lt;code&gt;j-c-diff&lt;/code&gt;, with 7 parameters, just like &lt;code&gt;GIT_EXTERNAL_DIFF&lt;/code&gt; program is called. See &lt;a href=&quot;git&quot;&gt;git[1]&lt;/a&gt; for details." onmousemove="i18n(this)">&Kcy;&ocy;&gcy;&dcy;&acy;  Git  &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy; &pcy;&ocy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &vcy;&acy;&mcy; &rcy;&acy;&zcy;&ncy;&icy;&tscy;&ucy; &dcy;&lcy;&yacy; &pcy;&ucy;&tcy;&icy; &scy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&mcy;  <code>diff</code> , &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ncy;&ycy;&mcy; &vcy;  <code>jcdiff</code> , &ocy;&ncy; &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ucy;&yucy; &vcy;&acy;&mcy;&icy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy; &scy; &vcy;&ycy;&shcy;&iecy;&ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&iecy;&jcy;, &tcy;.&iecy;.  <code>j-c-diff</code> , &scy; 7 &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&acy;&mcy;&icy;, &tcy;&ocy;&chcy;&ncy;&ocy; &tcy;&acy;&kcy; &zhcy;&iecy;, &kcy;&acy;&kcy; &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&acy;  <code>GIT_EXTERNAL_DIFF</code> . &Pcy;&ocy;&dcy;&rcy;&ocy;&bcy;&ncy;&ocy;&scy;&tcy;&icy; &scy;&mcy;. &vcy;  <a href="git.html">git[1]</a> .</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_setting_the_internal_diff_algorithm"><span data-i18n="acec35e2c5ed687d218774efeb4611385796e2469fdb2b47ebe97645bc67c0fd/c7" data-source="Setting the internal diff algorithm" onmousemove="i18n(this)">&Ncy;&acy;&scy;&tcy;&rcy;&ocy;&jcy;&kcy;&acy; &vcy;&ncy;&ucy;&tcy;&rcy;&iecy;&ncy;&ncy;&iecy;&gcy;&ocy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy;&acy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;</span></h4> <p><span data-i18n="7da1f04604cbd0abc768cd15b476848d6c743011eed344a93db283708cac7cbf/c5" data-source="The diff algorithm can be set through the &lt;code&gt;diff.algorithm&lt;/code&gt; config key, but sometimes it may be helpful to set the diff algorithm per path. For example, one may want to use the &lt;code&gt;minimal&lt;/code&gt; diff algorithm for .json files, and the &lt;code&gt;histogram&lt;/code&gt; for .c files, and so on without having to pass in the algorithm through the command line each time." onmousemove="i18n(this)">&Acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &mcy;&ocy;&zhcy;&ncy;&ocy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&ocy;&ncy;&ncy;&ocy;&gcy;&ocy; &kcy;&lcy;&yucy;&chcy;&acy;  <code>diff.algorithm</code> , &ncy;&ocy; &icy;&ncy;&ocy;&gcy;&dcy;&acy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ocy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;&scy;&yacy; &pcy;&ocy;&lcy;&iecy;&zcy;&ncy;&ycy;&mcy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&softcy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&gcy;&ocy; &pcy;&ucy;&tcy;&icy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;  <code>minimal</code>  &dcy;&lcy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; .json &icy;  <code>histogram</code>  &dcy;&lcy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; .c &icy; &tcy;. &dcy;. &bcy;&iecy;&zcy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy;&scy;&tcy;&icy; &kcy;&acy;&zhcy;&dcy;&ycy;&jcy; &rcy;&acy;&zcy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&vcy;&acy;&tcy;&softcy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &chcy;&iecy;&rcy;&iecy;&zcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ucy;&yucy; &scy;&tcy;&rcy;&ocy;&kcy;&ucy;.</span></p> <p><span data-i18n="a5ebb1f1d6364619a89d393a347f35c1d1268449a2874a3104e16dd1810bc5ee/98" data-source="First, in &lt;code&gt;.gitattributes&lt;/code&gt;, assign the &lt;code&gt;diff&lt;/code&gt; attribute for paths." onmousemove="i18n(this)">&Scy;&ncy;&acy;&chcy;&acy;&lcy;&acy; &vcy;  <code>.gitattributes</code>  &ncy;&acy;&zcy;&ncy;&acy;&chcy;&softcy;&tcy;&iecy; &dcy;&lcy;&yacy; &pcy;&ucy;&tcy;&iecy;&jcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>diff</code> .</span></p> <div> <div> <pre class="hljs language-xml">*.json diff=<span class="hljs-tag">&lt;<span class="hljs-name">name</span>&gt;</span></pre> </div> </div> <p><span data-i18n="566f3a3961e3d6065529e6b0cf1c313447c6dd6bdee2e4c64a60b409cc29addf/10" data-source="Then, define a &amp;quot;diff.&amp;lt;name&amp;gt;.algorithm&amp;quot; configuration to specify the diff algorithm, choosing from &lt;code&gt;myers&lt;/code&gt;, &lt;code&gt;patience&lt;/code&gt;, &lt;code&gt;minimal&lt;/code&gt;, or &lt;code&gt;histogram&lt;/code&gt;." onmousemove="i18n(this)">&Zcy;&acy;&tcy;&iecy;&mcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&iecy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&yucy;  &quot;diff.&lt;name&gt;.algorithm&quot; , &chcy;&tcy;&ocy;&bcy;&ycy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;, &vcy;&ycy;&bcy;&rcy;&acy;&vcy;  <code>myers</code> ,  <code>patience</code> ,  <code>minimal</code>  &icy;&lcy;&icy;  <code>histogram</code> .</span></p> <div> <div> <pre class="hljs language-ini"><span class="hljs-section">[diff &quot;&lt;name&gt;&quot;]</span>
  <span class="hljs-attr">algorithm</span> = histogram</pre> </div> </div> <p><span data-i18n="d8eff1088dd6cecc080353a49df783433f061d55af211e21469de13df5a4aebe/6e" data-source="This diff algorithm applies to user facing diff output like git-diff(1), git-show(1) and is used for the &lt;code&gt;--stat&lt;/code&gt; output as well. The merge machinery will not use the diff algorithm set through this method." onmousemove="i18n(this)">&Ecy;&tcy;&ocy;&tcy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &kcy; &vcy;&ycy;&vcy;&ocy;&dcy;&acy;&mcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;, &ocy;&bcy;&rcy;&acy;&shchcy;&iecy;&ncy;&ncy;&ycy;&mcy; &kcy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy;, &tcy;&acy;&kcy;&icy;&mcy; &kcy;&acy;&kcy; git-diff(1), git-show(1), &acy; &tcy;&acy;&kcy;&zhcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &vcy;&ycy;&vcy;&ocy;&dcy;&acy;  <code>--stat</code> . &Mcy;&iecy;&khcy;&acy;&ncy;&icy;&zcy;&mcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &ncy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;, &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ncy;&ycy;&jcy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &ecy;&tcy;&ocy;&gcy;&ocy; &mcy;&iecy;&tcy;&ocy;&dcy;&acy;.</span></p> <div> <div class="table-responsive"><table class="table"> <tr> <td> <div><span data-i18n="d8da2c49df39d91df7ecd199b92da7bf264f026242ccc69b08daeadfe587c45b/a2" data-source="Note" onmousemove="i18n(this)">Note</span></div> </td> <td><span data-i18n="474cb1c529902c5bffc474d1c5bf7406730546db5b4e6c417521698c82f8ccec/6a" data-source="If &lt;code&gt;diff.&amp;lt;name&amp;gt;.command&lt;/code&gt; is defined for path with the &lt;code&gt;diff=&amp;lt;name&amp;gt;&lt;/code&gt; attribute, it is executed as an external diff driver (see above), and adding &lt;code&gt;diff.&amp;lt;name&amp;gt;.algorithm&lt;/code&gt; has no effect, as the algorithm is not passed to the external diff driver." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy;  <code>diff.&lt;name&gt;.command</code>  &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy; &dcy;&lcy;&yacy; &pcy;&ucy;&tcy;&icy; &scy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&mcy;  <code>diff=&lt;name&gt;</code> , &ocy;&ncy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &vcy;&ncy;&iecy;&shcy;&ncy;&icy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; (&scy;&mcy;. &vcy;&ycy;&shcy;&iecy;), &icy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy;  <code>diff.&lt;name&gt;.algorithm</code>  &ncy;&iecy; &icy;&mcy;&iecy;&iecy;&tcy; &ncy;&icy;&kcy;&acy;&kcy;&ocy;&gcy;&ocy; &ecy;&fcy;&fcy;&iecy;&kcy;&tcy;&acy;, &pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &acy;&lcy;&gcy;&ocy;&rcy;&icy;&tcy;&mcy; &ncy;&iecy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy;&ncy;&iecy;&shcy;&ncy;&iecy;&mcy;&ucy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&ucy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;.</span></td> </tr> </table></div> </div> </div> <div> <h4 class="text-body-emphasis"  id="_defining_a_custom_hunk_header"><span data-i18n="f8d0b17ab3b4c06fb522746c752fe12c3c8fd4f1ec093f19b3b098c29a9a501f/ac" data-source="Defining a custom hunk-header" onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&ocy;&gcy;&ocy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&kcy;&acy; &fcy;&rcy;&acy;&gcy;&mcy;&iecy;&ncy;&tcy;&acy;</span></h4> <p><span data-i18n="7bd193ecc510b0481ae49e0c7b0c71447b053a4cf0e2225cf7cf261205f5d1c0/5e" data-source="Each group of changes (called a &amp;quot;hunk&amp;quot;) in the textual diff output is prefixed with a line of the form:" onmousemove="i18n(this)">&Kcy;&acy;&zhcy;&dcy;&acy;&yacy; &gcy;&rcy;&ucy;&pcy;&pcy;&acy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&jcy; (&ncy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&mcy;&acy;&yacy;  &quot;hunk&quot; ) &vcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &vcy;&ycy;&vcy;&ocy;&dcy;&acy;&khcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy; &pcy;&rcy;&iecy;&dcy;&vcy;&acy;&rcy;&yacy;&iecy;&tcy;&scy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&ocy;&jcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&iecy;&gcy;&ocy; &vcy;&icy;&dcy;&acy;:</span></p> <div> <div> <pre class="hljs language-python"><span class="hljs-meta">@@ -k,l +n,m @@ TEXT</span></pre> </div> </div> <p><span data-i18n="910f8cdcaadca4d435b935d92dca3e7a0a8b1dcd6c51bf1955d12540cae71834/d8" data-source="This is called a &lt;code&gt;hunk header&lt;/code&gt;. The &amp;quot;TEXT&amp;quot; portion is by default a line that begins with an alphabet, an underscore or a dollar sign; this matches what GNU &lt;code&gt;diff -p&lt;/code&gt; output uses. This default selection however is not suited for some contents, and you can use a customized pattern to make a selection." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &ncy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy;  <code>hunk header</code> . &CHcy;&acy;&scy;&tcy;&softcy;  &quot;TEXT&quot;  &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &scy;&ocy;&bcy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&ucy;, &ncy;&acy;&chcy;&icy;&ncy;&acy;&yucy;&shchcy;&ucy;&yucy;&scy;&yacy; &scy; &acy;&lcy;&fcy;&acy;&vcy;&icy;&tcy;&acy;, &pcy;&ocy;&dcy;&chcy;&iecy;&rcy;&kcy;&icy;&vcy;&acy;&ncy;&icy;&yacy; &icy;&lcy;&icy; &zcy;&ncy;&acy;&kcy;&acy; &dcy;&ocy;&lcy;&lcy;&acy;&rcy;&acy;; &ecy;&tcy;&ocy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy; &tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &vcy;&ycy;&vcy;&ocy;&dcy; GNU  <code>diff -p</code> . &Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &ecy;&tcy;&ocy;&tcy; &vcy;&ycy;&bcy;&ocy;&rcy; &pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &ncy;&iecy; &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&gcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy;, &icy; &dcy;&lcy;&yacy; &vcy;&ycy;&bcy;&ocy;&rcy;&acy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &scy;&ocy;&bcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&jcy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy;.</span></p> <p><span data-i18n="8158f3aa726832a9399db0c8f92b99cba3af71808ab59a7ddcd0512f021d5b20/ba" data-source="First, in .gitattributes, you would assign the &lt;code&gt;diff&lt;/code&gt; attribute for paths." onmousemove="i18n(this)">&Vcy;&ocy;-&pcy;&iecy;&rcy;&vcy;&ycy;&khcy;, &vcy; .gitattributes &vcy;&ycy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &ncy;&acy;&zcy;&ncy;&acy;&chcy;&icy;&tcy;&softcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>diff</code>  &dcy;&lcy;&yacy; &pcy;&ucy;&tcy;&iecy;&jcy;.</span></p> <div> <div> <pre class="hljs language-undefined">*.tex        diff=tex</pre> </div> </div> <p><span data-i18n="8dce22b2edb6980f9395849c5d8af41b66d0ea9238b9ba530465b852e1d2f694/ac" data-source="Then, you would define a &amp;quot;diff.tex.xfuncname&amp;quot; configuration to specify a regular expression that matches a line that you would want to appear as the hunk header &amp;quot;TEXT&amp;quot;. Add a section to your &lt;code&gt;$GIT_DIR/config&lt;/code&gt; file (or &lt;code&gt;$HOME/.gitconfig&lt;/code&gt; file) like this:" onmousemove="i18n(this)">&Zcy;&acy;&tcy;&iecy;&mcy; &vcy;&ycy; &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&yucy;  &quot;diff.tex.xfuncname&quot; , &chcy;&tcy;&ocy;&bcy;&ycy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &rcy;&iecy;&gcy;&ucy;&lcy;&yacy;&rcy;&ncy;&ocy;&iecy; &vcy;&ycy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&iecy;, &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&iecy;&iecy; &scy;&tcy;&rcy;&ocy;&kcy;&iecy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ucy;&yucy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&acy;&tcy;&softcy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &zcy;&acy;&gcy;&ocy;&lcy;&ocy;&vcy;&kcy;&acy; &fcy;&rcy;&acy;&gcy;&mcy;&iecy;&ncy;&tcy;&acy;  &quot;TEXT&quot; . &Dcy;&ocy;&bcy;&acy;&vcy;&softcy;&tcy;&iecy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &vcy; &fcy;&acy;&jcy;&lcy;  <code>$GIT_DIR/config</code>  (&icy;&lcy;&icy; &fcy;&acy;&jcy;&lcy;  <code>$HOME/.gitconfig</code> ) &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;:</span></p> <div> <div> <pre class="hljs language-swift">[diff <span class="hljs-string">&quot;tex&quot;</span>]
        xfuncname <span class="hljs-operator">=</span> <span class="hljs-string">&quot;^(<span class="hljs-subst">\\</span><span class="hljs-subst">\\</span>(sub)*section<span class="hljs-subst">\\</span>{.*)$&quot;</span></pre> </div> </div> <p><span data-i18n="cdac68fe5f22bba209ba71246d9f8903850208c12cb83bd76761cf1ddb5f5b5a/c9" data-source="Note. A single level of backslashes are eaten by the configuration file parser, so you would need to double the backslashes; the pattern above picks a line that begins with a backslash, and zero or more occurrences of &lt;code&gt;sub&lt;/code&gt; followed by &lt;code&gt;section&lt;/code&gt; followed by open brace, to the end of line." onmousemove="i18n(this)">&Pcy;&rcy;&icy;&mcy;&iecy;&chcy;&acy;&ncy;&icy;&iecy;. &Acy;&ncy;&acy;&lcy;&icy;&zcy;&acy;&tcy;&ocy;&rcy; &fcy;&acy;&jcy;&lcy;&acy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy; &ocy;&dcy;&icy;&ncy; &ucy;&rcy;&ocy;&vcy;&iecy;&ncy;&softcy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy;&jcy; &kcy;&ocy;&scy;&ocy;&jcy; &chcy;&iecy;&rcy;&tcy;&ycy;, &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &vcy;&acy;&mcy; &pcy;&rcy;&icy;&dcy;&iecy;&tcy;&scy;&yacy; &ucy;&dcy;&vcy;&ocy;&icy;&tcy;&softcy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ucy;&yucy; &kcy;&ocy;&scy;&ucy;&yucy; &chcy;&iecy;&rcy;&tcy;&ucy;; &shcy;&acy;&bcy;&lcy;&ocy;&ncy; &vcy;&ycy;&shcy;&iecy; &vcy;&ycy;&bcy;&icy;&rcy;&acy;&iecy;&tcy; &scy;&tcy;&rcy;&ocy;&kcy;&ucy;, &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &ncy;&acy;&chcy;&icy;&ncy;&acy;&iecy;&tcy;&scy;&yacy; &scy; &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&ocy;&jcy; &kcy;&ocy;&scy;&ocy;&jcy; &chcy;&iecy;&rcy;&tcy;&ycy; &icy; &ncy;&ocy;&lcy;&softcy; &icy;&lcy;&icy; &bcy;&ocy;&lcy;&iecy;&iecy; &vcy;&khcy;&ocy;&zhcy;&dcy;&iecy;&ncy;&icy;&jcy;  <code>sub</code> , &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy;  <code>section</code> , &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &ocy;&tcy;&kcy;&rcy;&ycy;&vcy;&acy;&yucy;&shchcy;&acy;&yacy; &scy;&kcy;&ocy;&bcy;&kcy;&acy; &dcy;&ocy; &kcy;&ocy;&ncy;&tscy;&acy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;.</span></p> <p><span data-i18n="5d48cca6a612fc82ac39feaf7c6864f43459a84a341f010defa48f009f5117fd/e5" data-source="There are a few built-in patterns to make this easier, and &lt;code&gt;tex&lt;/code&gt; is one of them, so you do not have to write the above in your configuration file (you still need to enable this with the attribute mechanism, via &lt;code&gt;.gitattributes&lt;/code&gt;). The following built in patterns are available:" onmousemove="i18n(this)">&IEcy;&scy;&tcy;&softcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&khcy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy;&ocy;&vcy;, &ucy;&pcy;&rcy;&ocy;&shchcy;&acy;&yucy;&shchcy;&icy;&khcy; &ecy;&tcy;&ocy;, &icy;  <code>tex</code>  &mdash; &ocy;&dcy;&icy;&ncy; &icy;&zcy; &ncy;&icy;&khcy;, &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &vcy;&acy;&mcy; &ncy;&iecy; &ncy;&ucy;&zhcy;&ncy;&ocy; &pcy;&icy;&scy;&acy;&tcy;&softcy; &vcy;&scy;&iecy; &vcy;&ycy;&shcy;&iecy;&pcy;&iecy;&rcy;&iecy;&chcy;&icy;&scy;&lcy;&iecy;&ncy;&ncy;&ocy;&iecy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy; (&vcy;&acy;&mcy; &vcy;&scy;&iecy; &rcy;&acy;&vcy;&ncy;&ocy; &ncy;&ucy;&zhcy;&ncy;&ocy; &vcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&softcy; &ecy;&tcy;&ocy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy; &mcy;&iecy;&khcy;&acy;&ncy;&icy;&zcy;&mcy;&acy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy; &chcy;&iecy;&rcy;&iecy;&zcy;  <code>.gitattributes</code> ). &Dcy;&ocy;&scy;&tcy;&ucy;&pcy;&ncy;&ycy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&iecy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy;&ycy;:</span></p> <div> <ul> <li> <p><span data-i18n="0aaec7495d69a9691d40a4d5278026952a89206222b5c262182c55e4e15c029f/b2" data-source="&lt;code&gt;ada&lt;/code&gt; suitable for source code in the Ada language." onmousemove="i18n(this)"><code>ada</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Ada.</span></p> </li> <li> <p><span data-i18n="e25336eedda53924c690e8058235e17cfd2de978a6acadd9f194a18d374e8695/40" data-source="&lt;code&gt;bash&lt;/code&gt; suitable for source code in the Bourne-Again SHell language. Covers a superset of POSIX shell function definitions." onmousemove="i18n(this)"><code>bash</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Bourne-Again SHell. &Ocy;&khcy;&vcy;&acy;&tcy;&ycy;&vcy;&acy;&iecy;&tcy; &rcy;&acy;&scy;&shcy;&icy;&rcy;&iecy;&ncy;&ncy;&ycy;&jcy; &ncy;&acy;&bcy;&ocy;&rcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&jcy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&jcy; &ocy;&bcy;&ocy;&lcy;&ocy;&chcy;&kcy;&icy; POSIX.</span></p> </li> <li> <p><span data-i18n="e14bc2b52e059747ec1703d48f60323c18c0a1acbf690688528e7e5b7415eb70/59" data-source="&lt;code&gt;bibtex&lt;/code&gt; suitable for files with BibTeX coded references." onmousemove="i18n(this)"><code>bibtex</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &scy;&ocy; &scy;&scy;&ycy;&lcy;&kcy;&acy;&mcy;&icy; &vcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&iecy; BibTeX.</span></p> </li> <li> <p><span data-i18n="e32325a356656f637748a0d9d9549ab3057f0b5dcd292471e25666dcbf3f7052/21" data-source="&lt;code&gt;cpp&lt;/code&gt; suitable for source code in the C and C++ languages." onmousemove="i18n(this)"><code>cpp</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&acy;&khcy; C &icy; C++.</span></p> </li> <li> <p><span data-i18n="752a2f58ead2da6ac9aebda9198ce3c3b72b803a538f81d83af2efb31d67bc97/43" data-source="&lt;code&gt;csharp&lt;/code&gt; suitable for source code in the C# language." onmousemove="i18n(this)"><code>csharp</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; C#.</span></p> </li> <li> <p><span data-i18n="39690052805b6d97eae91471f97099e6b1187a5047665fe42b55c632a1f9e393/4a" data-source="&lt;code&gt;css&lt;/code&gt; suitable for cascading style sheets." onmousemove="i18n(this)"><code>css</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &kcy;&acy;&scy;&kcy;&acy;&dcy;&ncy;&ycy;&khcy; &tcy;&acy;&bcy;&lcy;&icy;&tscy; &scy;&tcy;&icy;&lcy;&iecy;&jcy;.</span></p> </li> <li> <p><span data-i18n="cb8fe8180c1440612fe6d6026d29aace2a8c82f9c22d385cac5ff57a6d4da16b/86" data-source="&lt;code&gt;dts&lt;/code&gt; suitable for devicetree (DTS) files." onmousemove="i18n(this)"><code>dts</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &ucy;&scy;&tcy;&rcy;&ocy;&jcy;&scy;&tcy;&vcy; (DTS).</span></p> </li> <li> <p><span data-i18n="35e5399a180982e77f4b5b48a26c2c923e430de5fccebe76cccb0dfaeddf00d9/29" data-source="&lt;code&gt;elixir&lt;/code&gt; suitable for source code in the Elixir language." onmousemove="i18n(this)"><code>elixir</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Elixir.</span></p> </li> <li> <p><span data-i18n="1c9bc4bf5ad05b2e032a06be8678b2449b0aff727ec3bfd52faa237ceeb6b6d7/3d" data-source="&lt;code&gt;fortran&lt;/code&gt; suitable for source code in the Fortran language." onmousemove="i18n(this)"><code>fortran</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; &Fcy;&ocy;&rcy;&tcy;&rcy;&acy;&ncy;.</span></p> </li> <li> <p><span data-i18n="6590009ed3e65f983b33ed9893bea5e21539f450be8c1b821fad8a119c99451a/8c" data-source="&lt;code&gt;fountain&lt;/code&gt; suitable for Fountain documents." onmousemove="i18n(this)"><code>fountain</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy; Fountain.</span></p> </li> <li> <p><span data-i18n="ea6a5ab600b84b782d62471a1ebeaa0b75877ff0973906e87e8f91985fd01f33/0e" data-source="&lt;code&gt;golang&lt;/code&gt; suitable for source code in the Go language." onmousemove="i18n(this)"><code>golang</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Go.</span></p> </li> <li> <p><span data-i18n="51d3c371feb9ea6bd6b3f21912b699d32fc50cfb6abab97cfbeb62c83832354d/2e" data-source="&lt;code&gt;html&lt;/code&gt; suitable for HTML/XHTML documents." onmousemove="i18n(this)"><code>html</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy; HTML/XHTML.</span></p> </li> <li> <p><span data-i18n="d3830fc514a06fb0df6803a76516574d8f06f075fa25a4476fd189708323be85/03" data-source="&lt;code&gt;java&lt;/code&gt; suitable for source code in the Java language." onmousemove="i18n(this)"><code>java</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Java.</span></p> </li> <li> <p><span data-i18n="fe043049c26041416452426a3eccc0db2aa65e22bc6aa4ed1ce3ffa57eff6a68/68" data-source="&lt;code&gt;kotlin&lt;/code&gt; suitable for source code in the Kotlin language." onmousemove="i18n(this)"><code>kotlin</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Kotlin.</span></p> </li> <li> <p><span data-i18n="4a731e1f8774009d92c3f907ce5928a93ce373577d9c8c99bb7f2edec408539d/e0" data-source="&lt;code&gt;markdown&lt;/code&gt; suitable for Markdown documents." onmousemove="i18n(this)"><code>markdown</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy; Markdown.</span></p> </li> <li> <p><span data-i18n="cf7f3a1ba8b48a02a71dac03ed2a1663ed5a239c1dacdcc9e320b0977e78f8c7/c8" data-source="&lt;code&gt;matlab&lt;/code&gt; suitable for source code in the MATLAB and Octave languages." onmousemove="i18n(this)"><code>matlab</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&acy;&khcy; MATLAB &icy; Octave.</span></p> </li> <li> <p><span data-i18n="511f6065a11f2442450384ccce553968a927f043801a8455fc28d9e4ab47cb7c/79" data-source="&lt;code&gt;objc&lt;/code&gt; suitable for source code in the Objective-C language." onmousemove="i18n(this)"><code>objc</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Objective-C.</span></p> </li> <li> <p><span data-i18n="3218f5ca30620eca4ff6230190495a96f9d4ff7069e789c6bf5c18f58f9c64a5/99" data-source="&lt;code&gt;pascal&lt;/code&gt; suitable for source code in the Pascal/Delphi language." onmousemove="i18n(this)"><code>pascal</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Pascal/Delphi.</span></p> </li> <li> <p><span data-i18n="47bb35f3b5d39f2a47d54b857932d26006aaa0a38de22c97af830eeda94d1c69/f2" data-source="&lt;code&gt;perl&lt;/code&gt; suitable for source code in the Perl language." onmousemove="i18n(this)"><code>perl</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Perl.</span></p> </li> <li> <p><span data-i18n="2a65c57e8cea68b24667497f62ce10590cf6c61613df50abafa482afdd18de4d/71" data-source="&lt;code&gt;php&lt;/code&gt; suitable for source code in the PHP language." onmousemove="i18n(this)"><code>php</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; PHP.</span></p> </li> <li> <p><span data-i18n="447d1b8d14d5a762ac2204b9917088ff602494ddea570000e2991fcc62306d0c/db" data-source="&lt;code&gt;python&lt;/code&gt; suitable for source code in the Python language." onmousemove="i18n(this)"><code>python</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy;  Python .</span></p> </li> <li> <p><span data-i18n="569c14c9a3611696803c55991867fe1ae43cf88acb96070ea5beae0cb7c85c21/3e" data-source="&lt;code&gt;ruby&lt;/code&gt; suitable for source code in the Ruby language." onmousemove="i18n(this)"><code>ruby</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Ruby.</span></p> </li> <li> <p><span data-i18n="86bf8193464be466d18bda08ececf215b0746038c1efc802a710467ef91e15e8/4b" data-source="&lt;code&gt;rust&lt;/code&gt; suitable for source code in the Rust language." onmousemove="i18n(this)"><code>rust</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Rust.</span></p> </li> <li> <p><span data-i18n="bafbf10ff0d6f9d401a7c9cc4203aa02a1cc00ae493ea70abd87f8cbbc4adf67/d6" data-source="&lt;code&gt;scheme&lt;/code&gt; suitable for source code in the Scheme language." onmousemove="i18n(this)"><code>scheme</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &ncy;&acy; &yacy;&zcy;&ycy;&kcy;&iecy; Scheme.</span></p> </li> <li> <p><span data-i18n="a3bbee4291705e64dacd7925c0e06f19b4350111b839efaacd921c37282ec428/75" data-source="&lt;code&gt;tex&lt;/code&gt; suitable for source code for LaTeX documents." onmousemove="i18n(this)"><code>tex</code>  &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &icy;&scy;&khcy;&ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ocy;&vcy; LaTeX.</span></p> </li> </ul> </div> </div> <div> <h4 class="text-body-emphasis"  id="_customizing_word_diff"><span data-i18n="f295839515948ae84b8a425b809191a3809abf72f4a5477af94380e50a7046ff/a9" data-source="Customizing word diff" onmousemove="i18n(this)">&Ncy;&acy;&scy;&tcy;&rcy;&ocy;&jcy;&kcy;&acy; &rcy;&acy;&zcy;&ncy;&icy;&tscy;&ycy; &scy;&lcy;&ocy;&vcy;</span></h4> <p><span data-i18n="d8daa51451bc996a2210735e1f2027a2a7d2eeb982240262aa6c5d0f55122fa8/9d" data-source="You can customize the rules that &lt;code&gt;git diff --word-diff&lt;/code&gt; uses to split words in a line, by specifying an appropriate regular expression in the &amp;quot;diff.*.wordRegex&amp;quot; configuration variable. For example, in TeX a backslash followed by a sequence of letters forms a command, but several such commands can be run together without intervening whitespace. To separate them, use a regular expression in your &lt;code&gt;$GIT_DIR/config&lt;/code&gt; file (or &lt;code&gt;$HOME/.gitconfig&lt;/code&gt; file) like this:" onmousemove="i18n(this)">&Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&icy;&tcy;&softcy; &pcy;&rcy;&acy;&vcy;&icy;&lcy;&acy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy;  <code>git diff --word-diff</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &dcy;&lcy;&yacy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &scy;&lcy;&ocy;&vcy; &vcy; &scy;&tcy;&rcy;&ocy;&kcy;&iecy;, &ucy;&kcy;&acy;&zcy;&acy;&vcy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&iecy;&iecy; &rcy;&iecy;&gcy;&ucy;&lcy;&yacy;&rcy;&ncy;&ocy;&iecy; &vcy;&ycy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&iecy; &vcy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  &quot;diff.*.wordRegex&quot; . &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &vcy; TeX &ocy;&bcy;&rcy;&acy;&tcy;&ncy;&acy;&yacy; &kcy;&ocy;&scy;&acy;&yacy; &chcy;&iecy;&rcy;&tcy;&acy;, &zcy;&acy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&jcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&scy;&tcy;&softcy; &bcy;&ucy;&kcy;&vcy;, &ocy;&bcy;&rcy;&acy;&zcy;&ucy;&iecy;&tcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy;, &ncy;&ocy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &tcy;&acy;&kcy;&icy;&khcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&tcy;&softcy; &vcy;&mcy;&iecy;&scy;&tcy;&iecy; &bcy;&iecy;&zcy; &pcy;&rcy;&ocy;&mcy;&iecy;&zhcy;&ucy;&tcy;&ocy;&chcy;&ncy;&ycy;&khcy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&ocy;&vcy;. &CHcy;&tcy;&ocy;&bcy;&ycy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &icy;&khcy;, &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &rcy;&iecy;&gcy;&ucy;&lcy;&yacy;&rcy;&ncy;&ocy;&iecy; &vcy;&ycy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&iecy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy;  <code>$GIT_DIR/config</code>  (&icy;&lcy;&icy; &fcy;&acy;&jcy;&lcy;&iecy;  <code>$HOME/.gitconfig</code> ), &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;:</span></p> <div> <div> <pre class="hljs language-swift">[diff <span class="hljs-string">&quot;tex&quot;</span>]
        wordRegex <span class="hljs-operator">=</span> <span class="hljs-string">&quot;<span class="hljs-subst">\\</span><span class="hljs-subst">\\</span>[a-zA-Z]+|[{}]|<span class="hljs-subst">\\</span><span class="hljs-subst">\\</span>.|[^<span class="hljs-subst">\\</span>{}[:space:]]+&quot;</span></pre> </div> </div> <p><span data-i18n="7badaae93d81af069d23e8f8bc0efca1e3d7aee17cfa9f7bf59707504a89e0ba/31" data-source="A built-in pattern is provided for all languages listed in the previous section." onmousemove="i18n(this)">&Vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&jcy; &shcy;&acy;&bcy;&lcy;&ocy;&ncy; &pcy;&rcy;&iecy;&dcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &vcy;&scy;&iecy;&khcy; &yacy;&zcy;&ycy;&kcy;&ocy;&vcy;, &pcy;&iecy;&rcy;&iecy;&chcy;&icy;&scy;&lcy;&iecy;&ncy;&ncy;&ycy;&khcy; &vcy; &pcy;&rcy;&iecy;&dcy;&ycy;&dcy;&ucy;&shchcy;&iecy;&mcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;.</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_performing_text_diffs_of_binary_files"><span data-i18n="d725e361c2e29b86f20cf6f506aa552f9e09ba34c32dcfdd01002a526febf37b/79" data-source="Performing text diffs of binary files" onmousemove="i18n(this)">&Vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&iecy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;</span></h4> <p><span data-i18n="ab5e69bb33a4117f4176089c231da8974ba66ff959e78018b1732a6e15d93e44/78" data-source="Sometimes it is desirable to see the diff of a text-converted version of some binary files. For example, a word processor document can be converted to an ASCII text representation, and the diff of the text shown. Even though this conversion loses some information, the resulting diff is useful for human viewing (but cannot be applied directly)." onmousemove="i18n(this)">&Icy;&ncy;&ocy;&gcy;&dcy;&acy; &zhcy;&iecy;&lcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &ucy;&vcy;&icy;&dcy;&iecy;&tcy;&softcy; &rcy;&acy;&zcy;&ncy;&icy;&tscy;&ucy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ocy;&jcy; &vcy;&iecy;&rcy;&scy;&icy;&icy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &bcy;&icy;&ncy;&acy;&rcy;&ncy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &dcy;&ocy;&kcy;&ucy;&mcy;&iecy;&ncy;&tcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ocy;&gcy;&ocy; &pcy;&rcy;&ocy;&tscy;&iecy;&scy;&scy;&ocy;&rcy;&acy; &mcy;&ocy;&zhcy;&ncy;&ocy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &vcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ocy;&iecy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; ASCII &icy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zcy;&icy;&tcy;&softcy; &rcy;&acy;&zcy;&ncy;&icy;&tscy;&ucy; &tcy;&iecy;&kcy;&scy;&tcy;&acy;. &Ncy;&iecy;&scy;&mcy;&ocy;&tcy;&rcy;&yacy; &ncy;&acy; &tcy;&ocy;, &chcy;&tcy;&ocy; &pcy;&rcy;&icy; &ecy;&tcy;&ocy;&mcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&icy; &tcy;&iecy;&rcy;&yacy;&iecy;&tcy;&scy;&yacy; &ncy;&iecy;&kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&yacy;, &pcy;&ocy;&lcy;&ucy;&chcy;&iecy;&ncy;&ncy;&ycy;&jcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &pcy;&ocy;&lcy;&iecy;&zcy;&iecy;&ncy; &dcy;&lcy;&yacy; &pcy;&rcy;&ocy;&scy;&mcy;&ocy;&tcy;&rcy;&acy; &chcy;&iecy;&lcy;&ocy;&vcy;&iecy;&kcy;&ocy;&mcy; (&ncy;&ocy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy; &bcy;&ycy;&tcy;&softcy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&iecy;&ncy; &ncy;&acy;&pcy;&rcy;&yacy;&mcy;&ucy;&yucy;).</span></p> <p><span data-i18n="8193c7ce4f6d3beb298f32639490c388bfb878dc7d2f908ea8cd57c0290a77de/c8" data-source="The &lt;code&gt;textconv&lt;/code&gt; config option is used to define a program for performing such a conversion. The program should take a single argument, the name of a file to convert, and produce the resulting text on stdout." onmousemove="i18n(this)">&Ocy;&pcy;&tscy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>textconv</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ycy; &dcy;&lcy;&yacy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&yacy; &tcy;&acy;&kcy;&ocy;&gcy;&ocy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;. &Pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&acy; &dcy;&ocy;&lcy;&zhcy;&ncy;&acy; &pcy;&rcy;&icy;&ncy;&icy;&mcy;&acy;&tcy;&softcy; &iecy;&dcy;&icy;&ncy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&jcy; &acy;&rcy;&gcy;&ucy;&mcy;&iecy;&ncy;&tcy; &mdash; &icy;&mcy;&yacy; &fcy;&acy;&jcy;&lcy;&acy; &dcy;&lcy;&yacy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &icy; &vcy;&ycy;&dcy;&acy;&vcy;&acy;&tcy;&softcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&icy;&rcy;&ucy;&yucy;&shchcy;&icy;&jcy; &tcy;&iecy;&kcy;&scy;&tcy; &ncy;&acy; &scy;&tcy;&acy;&ncy;&dcy;&acy;&rcy;&tcy;&ncy;&ycy;&jcy; &vcy;&ycy;&vcy;&ocy;&dcy;.</span></p> <p><span data-i18n="507dd020d423653401f42d5fa38d8fc7d583d84e91c046baf86243f97a9535df/30" data-source="For example, to show the diff of the exif information of a file instead of the binary information (assuming you have the exif tool installed), add the following section to your &lt;code&gt;$GIT_DIR/config&lt;/code&gt; file (or &lt;code&gt;$HOME/.gitconfig&lt;/code&gt; file):" onmousemove="i18n(this)">&Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&ocy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &rcy;&acy;&zcy;&ncy;&icy;&tscy;&ucy; &scy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&iecy;&jcy; exif &fcy;&acy;&jcy;&lcy;&acy; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ocy;&jcy; &icy;&ncy;&fcy;&ocy;&rcy;&mcy;&acy;&tscy;&icy;&icy; (&pcy;&rcy;&icy; &ucy;&scy;&lcy;&ocy;&vcy;&icy;&icy;, &chcy;&tcy;&ocy; &ucy; &vcy;&acy;&scy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy; exif), &dcy;&ocy;&bcy;&acy;&vcy;&softcy;&tcy;&iecy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&jcy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &vcy; &fcy;&acy;&jcy;&lcy;  <code>$GIT_DIR/config</code>  (&icy;&lcy;&icy; &fcy;&acy;&jcy;&lcy;  <code>$HOME/.gitconfig</code> ):</span></p> <div> <div> <pre class="hljs language-ini"><span class="hljs-section">[diff &quot;jpg&quot;]</span>
        <span class="hljs-attr">textconv</span> = exif</pre> </div> </div> <div> <div class="table-responsive"><table class="table"> <tr> <td> <div><span data-i18n="d8da2c49df39d91df7ecd199b92da7bf264f026242ccc69b08daeadfe587c45b/a2" data-source="Note" onmousemove="i18n(this)">Note</span></div> </td> <td><span data-i18n="1027e98a6ed7091cdb37f5d085a9c7e9c340035f7b4c2f48aa7831b4c17e83c3/b6" data-source="The text conversion is generally a one-way conversion; in this example, we lose the actual image contents and focus just on the text data. This means that diffs generated by textconv are &lt;em&gt;not&lt;/em&gt; suitable for applying. For this reason, only &lt;code&gt;git diff&lt;/code&gt; and the &lt;code&gt;git log&lt;/code&gt; family of commands (i.e., log, whatchanged, show) will perform text conversion. &lt;code&gt;git
format-patch&lt;/code&gt; will never generate this output. If you want to send somebody a text-converted diff of a binary file (e.g., because it quickly conveys the changes you have made), you should generate it separately and send it as a comment &lt;em&gt;in addition to&lt;/em&gt; the usual binary diff that you might send." onmousemove="i18n(this)">&Pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &tcy;&iecy;&kcy;&scy;&tcy;&acy; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &yacy;&vcy;&lcy;&yacy;&iecy;&tcy;&scy;&yacy; &ocy;&dcy;&ncy;&ocy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&icy;&mcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;&mcy;; &vcy; &ecy;&tcy;&ocy;&mcy; &pcy;&rcy;&icy;&mcy;&iecy;&rcy;&iecy; &mcy;&ycy; &tcy;&iecy;&rcy;&yacy;&iecy;&mcy; &fcy;&acy;&kcy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &icy;&zcy;&ocy;&bcy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&yacy; &icy; &fcy;&ocy;&kcy;&ucy;&scy;&icy;&rcy;&ucy;&iecy;&mcy;&scy;&yacy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &ncy;&acy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &dcy;&acy;&ncy;&ncy;&ycy;&khcy;. &Ecy;&tcy;&ocy; &ocy;&zcy;&ncy;&acy;&chcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy;, &scy;&gcy;&iecy;&ncy;&iecy;&rcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; textconv, &ncy;&iecy;&pcy;&rcy;&icy;&gcy;&ocy;&dcy;&ncy;&ycy; &dcy;&lcy;&yacy; &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;. &Pcy;&ocy; &ecy;&tcy;&ocy;&jcy; &pcy;&rcy;&icy;&chcy;&icy;&ncy;&iecy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy;  <code>git diff</code>  &icy; &scy;&iecy;&mcy;&iecy;&jcy;&scy;&tcy;&vcy;&acy;  <code>git log</code>  (&tcy;. &iecy;. log, WhatChanged, Show) &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&yucy;&tcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &tcy;&iecy;&kcy;&scy;&tcy;&acy;.  <code>git
format-patch</code>  &ncy;&icy;&kcy;&ocy;&gcy;&dcy;&acy; &ncy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &gcy;&iecy;&ncy;&iecy;&rcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &ecy;&tcy;&ocy;&tcy; &vcy;&ycy;&vcy;&ocy;&dcy;. &IEcy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&icy;&tcy;&softcy; &kcy;&ocy;&mcy;&ucy;-&ncy;&icy;&bcy;&ucy;&dcy;&softcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&jcy; &vcy; &tcy;&iecy;&kcy;&scy;&tcy; &dcy;&icy;&fcy;&fcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &pcy;&ocy;&tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy; &ocy;&ncy; &bcy;&ycy;&scy;&tcy;&rcy;&ocy; &pcy;&iecy;&rcy;&iecy;&dcy;&acy;&iecy;&tcy; &vcy;&ncy;&iecy;&scy;&iecy;&ncy;&ncy;&ycy;&iecy; &vcy;&acy;&mcy;&icy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;), &vcy;&acy;&mcy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &scy;&gcy;&iecy;&ncy;&iecy;&rcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy; &iecy;&gcy;&ocy; &ocy;&tcy;&dcy;&iecy;&lcy;&softcy;&ncy;&ocy; &icy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&icy;&tcy;&softcy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &kcy;&ocy;&mcy;&mcy;&iecy;&ncy;&tcy;&acy;&rcy;&icy;&yacy; &vcy; &dcy;&ocy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&iecy; &kcy; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy;&mcy;&ucy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ocy;&mcy;&ucy; &dcy;&icy;&fcy;&fcy;&ucy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ocy;&tcy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&tcy;&softcy;.</span></td> </tr> </table></div> </div> <p><span data-i18n="52936913952c108d8c894d6f16126d473d305c9084a499ec656f04f3789f19e1/8e" data-source="Because text conversion can be slow, especially when doing a large number of them with &lt;code&gt;git log -p&lt;/code&gt;, Git provides a mechanism to cache the output and use it in future diffs. To enable caching, set the &amp;quot;cachetextconv&amp;quot; variable in your diff driver&amp;rsquo;s config. For example:" onmousemove="i18n(this)">&Pcy;&ocy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ucy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &tcy;&iecy;&kcy;&scy;&tcy;&acy; &mcy;&ocy;&zhcy;&iecy;&tcy; &bcy;&ycy;&tcy;&softcy; &mcy;&iecy;&dcy;&lcy;&iecy;&ncy;&ncy;&ycy;&mcy;, &ocy;&scy;&ocy;&bcy;&iecy;&ncy;&ncy;&ocy; &pcy;&rcy;&icy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&icy; &bcy;&ocy;&lcy;&softcy;&shcy;&ocy;&gcy;&ocy; &kcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&tcy;&vcy;&acy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&jcy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>git log -p</code> ,  Git  &pcy;&rcy;&iecy;&dcy;&ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &mcy;&iecy;&khcy;&acy;&ncy;&icy;&zcy;&mcy; &kcy;&ecy;&shcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &vcy;&ycy;&vcy;&ocy;&dcy;&acy; &icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &iecy;&gcy;&ocy; &vcy; &bcy;&ucy;&dcy;&ucy;&shchcy;&icy;&khcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy;&khcy;. &CHcy;&tcy;&ocy;&bcy;&ycy; &vcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&softcy; &kcy;&ecy;&shcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;, &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&icy;&tcy;&iecy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy;  &quot;cachetextconv&quot;  &vcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy; &vcy;&acy;&shcy;&iecy;&gcy;&ocy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;:</span></p> <div> <div> <pre class="hljs language-ini"><span class="hljs-section">[diff &quot;jpg&quot;]</span>
        <span class="hljs-attr">textconv</span> = exif
        <span class="hljs-attr">cachetextconv</span> = <span class="hljs-literal">true</span></pre> </div> </div> <p><span data-i18n="2353ed989d7bc2f8d29eb8273d6b8848b1fcbce426637cc7cd14c281b6b51d32/4e" data-source="This will cache the result of running &amp;quot;exif&amp;quot; on each blob indefinitely. If you change the textconv config variable for a diff driver, Git will automatically invalidate the cache entries and re-run the textconv filter. If you want to invalidate the cache manually (e.g., because your version of &amp;quot;exif&amp;quot; was updated and now produces better output), you can remove the cache manually with &lt;code&gt;git update-ref -d refs/notes/textconv/jpg&lt;/code&gt; (where &amp;quot;jpg&amp;quot; is the name of the diff driver, as in the example above)." onmousemove="i18n(this)">&Pcy;&rcy;&icy; &ecy;&tcy;&ocy;&mcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;  &quot;exif&quot;  &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&gcy;&ocy; &bcy;&ocy;&lcy;&softcy;&shcy;&ocy;&gcy;&ocy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ocy;&gcy;&ocy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&acy; &bcy;&ucy;&dcy;&iecy;&tcy; &kcy;&ecy;&shcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &ncy;&acy; &ncy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&jcy; &scy;&rcy;&ocy;&kcy;. &IEcy;&scy;&lcy;&icy; &vcy;&ycy; &icy;&zcy;&mcy;&iecy;&ncy;&icy;&tcy;&iecy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ucy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy; textconv &dcy;&lcy;&yacy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;,  Git  &acy;&vcy;&tcy;&ocy;&mcy;&acy;&tcy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &acy;&ncy;&ncy;&ucy;&lcy;&icy;&rcy;&ucy;&iecy;&tcy; &zcy;&acy;&pcy;&icy;&scy;&icy; &kcy;&ecy;&shcy;&acy; &icy; &pcy;&ocy;&vcy;&tcy;&ocy;&rcy;&ncy;&ocy; &zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy; textconv. &IEcy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &scy;&dcy;&iecy;&lcy;&acy;&tcy;&softcy; &kcy;&iecy;&shcy; &ncy;&iecy;&dcy;&iecy;&jcy;&scy;&tcy;&vcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&mcy; &vcy;&rcy;&ucy;&chcy;&ncy;&ucy;&yucy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &pcy;&ocy;&tcy;&ocy;&mcy;&ucy; &chcy;&tcy;&ocy; &vcy;&acy;&shcy;&acy; &vcy;&iecy;&rcy;&scy;&icy;&yacy;  &quot;exif&quot;  &bcy;&ycy;&lcy;&acy; &ocy;&bcy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&acy; &ZeroWidthSpace;&ZeroWidthSpace;&icy; &tcy;&iecy;&pcy;&iecy;&rcy;&softcy; &vcy;&ycy;&dcy;&acy;&iecy;&tcy; &lcy;&ucy;&chcy;&shcy;&icy;&jcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;), &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ucy;&dcy;&acy;&lcy;&icy;&tcy;&softcy; &kcy;&iecy;&shcy; &vcy;&rcy;&ucy;&chcy;&ncy;&ucy;&yucy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  <code>git update-ref -d refs/notes/textconv/jpg</code>  (&gcy;&dcy;&iecy;  &quot;jpg&quot;  &mdash; &ecy;&tcy;&ocy; &icy;&mcy;&yacy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;, &kcy;&acy;&kcy; &vcy; &pcy;&rcy;&icy;&mcy;&iecy;&rcy;&iecy; &vcy;&ycy;&shcy;&iecy;). .</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_choosing_textconv_versus_external_diff"><span data-i18n="5903404db51e808d4d34b5ab0633b5ae9baf234476bd3bae6018fea10c601073/46" data-source="Choosing textconv versus external diff" onmousemove="i18n(this)">&Vcy;&ycy;&bcy;&ocy;&rcy; textconv &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &vcy;&ncy;&iecy;&shcy;&ncy;&iecy;&gcy;&ocy; diff</span></h4> <p><span data-i18n="e8f0e4682c7b0329e8ea22d7f5fa91f3c249059fff1c43ebfc98481b7b4bc1da/8b" data-source="If you want to show differences between binary or specially-formatted blobs in your repository, you can choose to use either an external diff command, or to use textconv to convert them to a diff-able text format. Which method you choose depends on your exact situation." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &vcy;&ycy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy; &pcy;&ocy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy; &mcy;&iecy;&zhcy;&dcy;&ucy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&mcy;&icy; &icy;&lcy;&icy; &scy;&pcy;&iecy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ocy; &ocy;&tcy;&fcy;&ocy;&rcy;&mcy;&acy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&mcy;&icy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&mcy;&icy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&acy;&mcy;&icy; &vcy; &vcy;&acy;&shcy;&iecy;&mcy; &rcy;&iecy;&pcy;&ocy;&zcy;&icy;&tcy;&ocy;&rcy;&icy;&icy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &vcy;&ncy;&iecy;&shcy;&ncy;&yucy;&yucy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ucy; diff &icy;&lcy;&icy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; textconv &dcy;&lcy;&yacy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &icy;&khcy; &vcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&jcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy; &scy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&softcy;&yucy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;. &Kcy;&acy;&kcy;&ocy;&jcy; &mcy;&iecy;&tcy;&ocy;&dcy; &vcy;&ycy; &vcy;&ycy;&bcy;&iecy;&rcy;&iecy;&tcy;&iecy;, &zcy;&acy;&vcy;&icy;&scy;&icy;&tcy; &ocy;&tcy; &vcy;&acy;&shcy;&iecy;&jcy; &kcy;&ocy;&ncy;&kcy;&rcy;&iecy;&tcy;&ncy;&ocy;&jcy; &scy;&icy;&tcy;&ucy;&acy;&tscy;&icy;&icy;.</span></p> <p><span data-i18n="1f0ad239894c5c46637ea9c4f2ae7cef9882e16131427adb2b1b424e0fe9f287/9f" data-source="The advantage of using an external diff command is flexibility. You are not bound to find line-oriented changes, nor is it necessary for the output to resemble unified diff. You are free to locate and report changes in the most appropriate way for your data format." onmousemove="i18n(this)">&Pcy;&rcy;&iecy;&icy;&mcy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &vcy;&ncy;&iecy;&shcy;&ncy;&iecy;&jcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy; diff &mdash; &gcy;&icy;&bcy;&kcy;&ocy;&scy;&tcy;&softcy;. &Vcy;&ycy; &ncy;&iecy; &ocy;&bcy;&yacy;&zcy;&acy;&ncy;&ycy; &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&softcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;, &ocy;&rcy;&icy;&iecy;&ncy;&tcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &ncy;&acy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;, &icy; &ncy;&iecy; &ocy;&bcy;&yacy;&zcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;, &chcy;&tcy;&ocy;&bcy;&ycy; &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ycy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy; &ncy;&acy;&pcy;&ocy;&mcy;&icy;&ncy;&acy;&lcy;&icy; &ucy;&ncy;&icy;&fcy;&icy;&tscy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&jcy; diff. &Vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&softcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy; &icy; &scy;&ocy;&ocy;&bcy;&shchcy;&acy;&tcy;&softcy; &ocy;&bcy; &icy;&zcy;&mcy;&iecy;&ncy;&iecy;&ncy;&icy;&yacy;&khcy; &ncy;&acy;&icy;&bcy;&ocy;&lcy;&iecy;&iecy; &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&yacy;&shchcy;&icy;&mcy; &dcy;&lcy;&yacy; &vcy;&acy;&shcy;&iecy;&gcy;&ocy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&acy; &dcy;&acy;&ncy;&ncy;&ycy;&khcy; &scy;&pcy;&ocy;&scy;&ocy;&bcy;&ocy;&mcy;.</span></p> <p><span data-i18n="984b309ffd7a279cf568149a49b74a57bb89ae95fb1ca2dd9885c8ad37d03048/76" data-source="A textconv, by comparison, is much more limiting. You provide a transformation of the data into a line-oriented text format, and Git uses its regular diff tools to generate the output. There are several advantages to choosing this method:" onmousemove="i18n(this)">&Tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ocy;&iecy; &scy;&ocy;&gcy;&lcy;&acy;&shcy;&iecy;&ncy;&icy;&iecy;, &pcy;&ocy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yucy; &scy; &ecy;&tcy;&icy;&mcy;, &icy;&mcy;&iecy;&iecy;&tcy; &gcy;&ocy;&rcy;&acy;&zcy;&dcy;&ocy; &bcy;&ocy;&lcy;&iecy;&iecy; &ocy;&gcy;&rcy;&acy;&ncy;&icy;&chcy;&iecy;&ncy;&ncy;&ycy;&iecy; &vcy;&ocy;&zcy;&mcy;&ocy;&zhcy;&ncy;&ocy;&scy;&tcy;&icy;. &Vcy;&ycy; &ocy;&bcy;&iecy;&scy;&pcy;&iecy;&chcy;&icy;&vcy;&acy;&iecy;&tcy;&iecy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&khcy; &vcy; &scy;&tcy;&rcy;&ocy;&kcy;&ocy;&vcy;&ycy;&jcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&jcy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;, &acy;  Git  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &scy;&vcy;&ocy;&icy; &ocy;&bcy;&ycy;&chcy;&ncy;&ycy;&iecy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&ycy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy; &dcy;&lcy;&yacy; &gcy;&iecy;&ncy;&iecy;&rcy;&acy;&tscy;&icy;&icy; &vcy;&ycy;&khcy;&ocy;&dcy;&ncy;&ycy;&khcy; &dcy;&acy;&ncy;&ncy;&ycy;&khcy;. &Vcy;&ycy;&bcy;&ocy;&rcy; &ecy;&tcy;&ocy;&gcy;&ocy; &mcy;&iecy;&tcy;&ocy;&dcy;&acy; &icy;&mcy;&iecy;&iecy;&tcy; &rcy;&yacy;&dcy; &pcy;&rcy;&iecy;&icy;&mcy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;:</span></p> <div> <ol> <li> <p><span data-i18n="d73e385d674e09d7c1f54cd95154f5fc7077ac05fe63b2df9e82ed4d0d0e387b/83" data-source="Ease of use. It is often much simpler to write a binary to text transformation than it is to perform your own diff. In many cases, existing programs can be used as textconv filters (e.g., exif, odt2txt)." onmousemove="i18n(this)">&Pcy;&rcy;&ocy;&scy;&tcy;&ocy;&tcy;&acy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;. &Zcy;&acy;&chcy;&acy;&scy;&tcy;&ucy;&yucy; &gcy;&ocy;&rcy;&acy;&zcy;&dcy;&ocy; &pcy;&rcy;&ocy;&shchcy;&iecy; &ncy;&acy;&pcy;&icy;&scy;&acy;&tcy;&softcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ocy;&gcy;&ocy; &kcy;&ocy;&dcy;&acy; &vcy; &tcy;&iecy;&kcy;&scy;&tcy;, &chcy;&iecy;&mcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&tcy;&softcy; &scy;&ocy;&bcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&jcy; &acy;&ncy;&acy;&lcy;&icy;&zcy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;. &Vcy;&ocy; &mcy;&ncy;&ocy;&gcy;&icy;&khcy; &scy;&lcy;&ucy;&chcy;&acy;&yacy;&khcy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &fcy;&icy;&lcy;&softcy;&tcy;&rcy;&ocy;&vcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &scy;&ucy;&shchcy;&iecy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&icy;&iecy; &pcy;&rcy;&ocy;&gcy;&rcy;&acy;&mcy;&mcy;&ycy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, exif, odt2txt).</span></p> </li> <li> <p><span data-i18n="6603b5a7f52c532a4731d0c8f9f2f0fcccfdca8983e303fb8093aac64f720e5c/a3" data-source="Git diff features. By performing only the transformation step yourself, you can still utilize many of Git&amp;rsquo;s diff features, including colorization, word-diff, and combined diffs for merges." onmousemove="i18n(this)">&Ocy;&tcy;&lcy;&icy;&chcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&iecy; &ocy;&scy;&ocy;&bcy;&iecy;&ncy;&ncy;&ocy;&scy;&tcy;&icy;  Git . &Vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&icy;&vcy; &scy;&acy;&mcy;&ocy;&scy;&tcy;&ocy;&yacy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &ecy;&tcy;&acy;&pcy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy;, &vcy;&ycy; &vcy;&scy;&iecy; &rcy;&acy;&vcy;&ncy;&ocy; &scy;&mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &mcy;&ncy;&ocy;&gcy;&icy;&iecy; &fcy;&ucy;&ncy;&kcy;&tscy;&icy;&icy; &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&yacy;  Git , &vcy;&kcy;&lcy;&yucy;&chcy;&acy;&yacy; &rcy;&acy;&scy;&kcy;&rcy;&acy;&shcy;&icy;&vcy;&acy;&ncy;&icy;&iecy;, &scy;&rcy;&acy;&vcy;&ncy;&iecy;&ncy;&icy;&iecy; &scy;&lcy;&ocy;&vcy; &icy; &kcy;&ocy;&mcy;&bcy;&icy;&ncy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&ncy;&ycy;&iecy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy; &dcy;&lcy;&yacy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&jcy;.</span></p> </li> <li> <p><span data-i18n="8e332a6119b9c34a98b70d8d6f76ee4b665f5aab25faed52e855f4514d8db2c8/a3" data-source="Caching. Textconv caching can speed up repeated diffs, such as those you might trigger by running &lt;code&gt;git log -p&lt;/code&gt;." onmousemove="i18n(this)">&Kcy;&ecy;&shcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;. &Kcy;&ecy;&shcy;&icy;&rcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; Textconv &mcy;&ocy;&zhcy;&iecy;&tcy; &ucy;&scy;&kcy;&ocy;&rcy;&icy;&tcy;&softcy; &pcy;&ocy;&vcy;&tcy;&ocy;&rcy;&yacy;&yucy;&shchcy;&icy;&iecy;&scy;&yacy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy; &tcy;&iecy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &mcy;&ocy;&gcy;&ucy;&tcy; &bcy;&ycy;&tcy;&softcy; &vcy;&ycy;&zcy;&vcy;&acy;&ncy;&ycy; &zcy;&acy;&pcy;&ucy;&scy;&kcy;&ocy;&mcy;  <code>git log -p</code> .</span></p> </li> </ol> </div> </div> <div> <h4 class="text-body-emphasis"  id="_marking_files_as_binary"><span data-i18n="91ea33836682517d43a369cf04856146a3bf4c31c05ee7dbc81000144e4608ae/e2" data-source="Marking files as binary" onmousemove="i18n(this)">&Mcy;&acy;&rcy;&kcy;&icy;&rcy;&ocy;&vcy;&kcy;&acy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &kcy;&acy;&kcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&khcy;</span></h4> <p><span data-i18n="444a57a8014a2dff2b1ef15463f3f11d3ece7237b1f0229938326b1b7b45187a/cd" data-source="Git usually guesses correctly whether a blob contains text or binary data by examining the beginning of the contents. However, sometimes you may want to override its decision, either because a blob contains binary data later in the file, or because the content, while technically composed of text characters, is opaque to a human reader. For example, many postscript files contain only ASCII characters, but produce noisy and meaningless diffs." onmousemove="i18n(this)">Git  &ocy;&bcy;&ycy;&chcy;&ncy;&ocy; &pcy;&rcy;&acy;&vcy;&icy;&lcy;&softcy;&ncy;&ocy; &ucy;&gcy;&acy;&dcy;&ycy;&vcy;&acy;&iecy;&tcy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &lcy;&icy; &bcy;&ocy;&lcy;&softcy;&shcy;&ocy;&jcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&jcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&iecy; &icy;&lcy;&icy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy;, &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&yacy;&yacy; &ncy;&acy;&chcy;&acy;&lcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy;. &Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &icy;&ncy;&ocy;&gcy;&dcy;&acy; &vcy;&acy;&mcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&ocy;&tcy;&rcy;&iecy;&bcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &ocy;&tcy;&mcy;&iecy;&ncy;&icy;&tcy;&softcy; &iecy;&gcy;&ocy; &rcy;&iecy;&shcy;&iecy;&ncy;&icy;&iecy;, &lcy;&icy;&bcy;&ocy; &pcy;&ocy;&tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy; &bcy;&ocy;&lcy;&softcy;&shcy;&ocy;&jcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&jcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &dcy;&acy;&ncy;&ncy;&ycy;&iecy; &pcy;&ocy;&zcy;&zhcy;&iecy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy;, &lcy;&icy;&bcy;&ocy; &pcy;&ocy;&tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy;, &khcy;&ocy;&tcy;&yacy; &tcy;&iecy;&khcy;&ncy;&icy;&chcy;&iecy;&scy;&kcy;&icy; &scy;&ocy;&scy;&tcy;&ocy;&icy;&tcy; &icy;&zcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&ocy;&vcy;, &ncy;&iecy;&pcy;&rcy;&ocy;&zcy;&rcy;&acy;&chcy;&ncy;&ocy; &dcy;&lcy;&yacy; &chcy;&icy;&tcy;&acy;&tcy;&iecy;&lcy;&yacy;-&chcy;&iecy;&lcy;&ocy;&vcy;&iecy;&kcy;&acy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &mcy;&ncy;&ocy;&gcy;&icy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; Postscript &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&tcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&ycy; ASCII, &ncy;&ocy; &scy;&ocy;&zcy;&dcy;&acy;&yucy;&tcy; &shcy;&ucy;&mcy;&ncy;&ycy;&iecy; &icy; &bcy;&iecy;&scy;&scy;&mcy;&ycy;&scy;&lcy;&iecy;&ncy;&ncy;&ycy;&iecy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy;.</span></p> <p><span data-i18n="0abc91dc007115c8524c1111656075fcc06862daec691aa605c3489ec712ff0e/db" data-source="The simplest way to mark a file as binary is to unset the diff attribute in the &lt;code&gt;.gitattributes&lt;/code&gt; file:" onmousemove="i18n(this)">&Scy;&acy;&mcy;&ycy;&jcy; &pcy;&rcy;&ocy;&scy;&tcy;&ocy;&jcy; &scy;&pcy;&ocy;&scy;&ocy;&bcy; &pcy;&ocy;&mcy;&iecy;&tcy;&icy;&tcy;&softcy; &fcy;&acy;&jcy;&lcy; &kcy;&acy;&kcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&jcy; &mdash; &ocy;&tcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&softcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; diff &vcy; &fcy;&acy;&jcy;&lcy;&iecy;  <code>.gitattributes</code> :</span></p> <div> <div> <pre class="hljs language-undefined">*.ps -diff</pre> </div> </div> <p><span data-i18n="5d3898a3490a3aaa2d188b1299bf27295e3a095f719f13da92a5e86ce33c80d8/4a" data-source="This will cause Git to generate &lt;code&gt;Binary files differ&lt;/code&gt; (or a binary patch, if binary patches are enabled) instead of a regular diff." onmousemove="i18n(this)">&Ecy;&tcy;&ocy; &pcy;&rcy;&icy;&vcy;&iecy;&dcy;&iecy;&tcy; &kcy; &tcy;&ocy;&mcy;&ucy;, &chcy;&tcy;&ocy;  Git  &bcy;&ucy;&dcy;&iecy;&tcy; &gcy;&iecy;&ncy;&iecy;&rcy;&icy;&rcy;&ocy;&vcy;&acy;&tcy;&softcy;  <code>Binary files differ</code>  (&icy;&lcy;&icy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&jcy; &pcy;&acy;&tcy;&chcy;, &iecy;&scy;&lcy;&icy; &bcy;&icy;&ncy;&acy;&rcy;&ncy;&ycy;&iecy; &icy;&scy;&pcy;&rcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&yacy; &vcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&ycy;) &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ocy;&bcy;&ycy;&chcy;&ncy;&ocy;&gcy;&ocy; diff.</span></p> <p><span data-i18n="efe4a397f52291542dbb772f4a515d313c953258f68113fe49603e4e9587dd6d/85" data-source="However, one may also want to specify other diff driver attributes. For example, you might want to use &lt;code&gt;textconv&lt;/code&gt; to convert postscript files to an ASCII representation for human viewing, but otherwise treat them as binary files. You cannot specify both &lt;code&gt;-diff&lt;/code&gt; and &lt;code&gt;diff=ps&lt;/code&gt; attributes. The solution is to use the &lt;code&gt;diff.*.binary&lt;/code&gt; config option:" onmousemove="i18n(this)">&Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &mcy;&ocy;&zhcy;&ncy;&ocy; &tcy;&acy;&kcy;&zhcy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &dcy;&rcy;&ucy;&gcy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&jcy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;  <code>textconv</code>  &dcy;&lcy;&yacy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; Postscript &vcy; &pcy;&rcy;&iecy;&dcy;&scy;&tcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&iecy; ASCII &dcy;&lcy;&yacy; &pcy;&rcy;&ocy;&scy;&mcy;&ocy;&tcy;&rcy;&acy; &chcy;&iecy;&lcy;&ocy;&vcy;&iecy;&kcy;&ocy;&mcy;, &ncy;&ocy; &vcy; &pcy;&rcy;&ocy;&tcy;&icy;&vcy;&ncy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &ocy;&bcy;&rcy;&acy;&bcy;&acy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &icy;&khcy; &kcy;&acy;&kcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy;. &Vcy;&ycy; &ncy;&iecy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &ocy;&dcy;&ncy;&ocy;&vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;  <code>-diff</code>  &icy;  <code>diff=ps</code> . &Rcy;&iecy;&shcy;&iecy;&ncy;&icy;&iecy; &mdash; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy; &ocy;&pcy;&tscy;&icy;&yucy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>diff.*.binary</code> :</span></p> <div> <div> <pre class="hljs language-ini"><span class="hljs-section">[diff &quot;ps&quot;]</span>
  <span class="hljs-attr">textconv</span> = ps2ascii
  <span class="hljs-attr">binary</span> = <span class="hljs-literal">true</span></pre> </div> </div> </div> </div> <div> <h3 class="text-body-emphasis"  id="_performing_a_three_way_merge"><span data-i18n="7ac09c66b1e82fef4996cc18a8a0fd2807b3eabae89abc489a813d6ad72246d6/12" data-source="Performing a three-way merge" onmousemove="i18n(this)">&Vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&icy;&iecy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;</span></h3> <div> <h4 class="text-body-emphasis"  id="_merge">
<code>merge</code>
</h4> <p><span data-i18n="effaf6583f31dd9a30fa557ac890d5706f94c0aea074a6ec46fd1e60afc2b85b/69" data-source="The attribute &lt;code&gt;merge&lt;/code&gt; affects how three versions of a file are merged when a file-level merge is necessary during &lt;code&gt;git merge&lt;/code&gt;, and other commands such as &lt;code&gt;git revert&lt;/code&gt; and &lt;code&gt;git cherry-pick&lt;/code&gt;." onmousemove="i18n(this)">&Acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>merge</code>  &vcy;&lcy;&icy;&yacy;&iecy;&tcy; &ncy;&acy; &tcy;&ocy;, &kcy;&acy;&kcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&yacy;&yucy;&tcy;&scy;&yacy; &tcy;&rcy;&icy; &vcy;&iecy;&rcy;&scy;&icy;&icy; &fcy;&acy;&jcy;&lcy;&acy;, &kcy;&ocy;&gcy;&dcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &ncy;&acy; &ucy;&rcy;&ocy;&vcy;&ncy;&iecy; &fcy;&acy;&jcy;&lcy;&acy; &ncy;&iecy;&ocy;&bcy;&khcy;&ocy;&dcy;&icy;&mcy;&ocy; &vcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy;  <code>git merge</code>  &icy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;, &tcy;&acy;&kcy;&icy;&khcy; &kcy;&acy;&kcy;  <code>git revert</code>  &icy;  <code>git cherry-pick</code> .</span></p> <div> <dl> <dt id="Documentation/gitattributes.txt-Set-1-1-1"><span data-i18n="b6f6f3ad07b3c05fa0bbbbf2e3d257ff1e3e31a83efbe2c9369cd008594f94e0/14" data-source="Set" onmousemove="i18n(this)">Set</span></dt> <dd> <p><span data-i18n="16fa02d43f4601b61199c105d79eb07c9a3adfc4d1e4a4363460202b4d3d0239/c5" data-source="Built-in 3-way merge driver is used to merge the contents in a way similar to &lt;code&gt;merge&lt;/code&gt; command of &lt;code&gt;RCS&lt;/code&gt; suite. This is suitable for ordinary text files." onmousemove="i18n(this)">&Vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&yacy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy; &acy;&ncy;&acy;&lcy;&ocy;&gcy;&icy;&chcy;&ncy;&ocy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&iecy;  <code>merge</code>  &pcy;&acy;&kcy;&iecy;&tcy;&acy;  <code>RCS</code> . &Ecy;&tcy;&ocy; &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &ocy;&bcy;&ycy;&chcy;&ncy;&ycy;&khcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unset-1-1-1"><span data-i18n="8d2dd4e8c7caa1acb407c161aad48d1201e93e0f6dcf54c8f19ae6fb3fd15127/b7" data-source="Unset" onmousemove="i18n(this)">Unset</span></dt> <dd> <p><span data-i18n="e1378423d07022c215bcdb529fa6bad5ffeef7560cb1027ef056594896c5a5eb/86" data-source="Take the version from the current branch as the tentative merge result, and declare that the merge has conflicts. This is suitable for binary files that do not have a well-defined merge semantics." onmousemove="i18n(this)">&Vcy;&ocy;&zcy;&softcy;&mcy;&icy;&tcy;&iecy; &vcy;&iecy;&rcy;&scy;&icy;&yucy; &icy;&zcy; &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; &vcy; &kcy;&acy;&chcy;&iecy;&scy;&tcy;&vcy;&iecy; &pcy;&rcy;&iecy;&dcy;&vcy;&acy;&rcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &icy; &ocy;&bcy;&hardcy;&yacy;&vcy;&icy;&tcy;&iecy;, &chcy;&tcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&tcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;. &Ecy;&tcy;&ocy; &pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&icy;&tcy; &dcy;&lcy;&yacy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &ncy;&iecy; &icy;&mcy;&iecy;&yucy;&tcy; &chcy;&iecy;&tcy;&kcy;&ocy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ocy;&jcy; &scy;&iecy;&mcy;&acy;&ncy;&tcy;&icy;&kcy;&icy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unspecified-1-1-1-1"><span data-i18n="5b8aa0bf3c59daec38e2d0c690a1a62513208d1e2075dad62a32ca0b9440b1a1/dd" data-source="Unspecified" onmousemove="i18n(this)">Unspecified</span></dt> <dd> <p><span data-i18n="a163093274c2f5916978c4b9651773d301c6683c95eaaa5e236cd19ce2f42e0a/06" data-source="By default, this uses the same built-in 3-way merge driver as is the case when the &lt;code&gt;merge&lt;/code&gt; attribute is set. However, the &lt;code&gt;merge.default&lt;/code&gt; configuration variable can name different merge driver to be used with paths for which the &lt;code&gt;merge&lt;/code&gt; attribute is unspecified." onmousemove="i18n(this)">&Pcy;&ocy; &ucy;&mcy;&ocy;&lcy;&chcy;&acy;&ncy;&icy;&yucy; &zcy;&dcy;&iecy;&scy;&softcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &tcy;&ocy;&tcy; &zhcy;&iecy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &chcy;&tcy;&ocy; &icy; &vcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy;, &kcy;&ocy;&gcy;&dcy;&acy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>merge</code> . &Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>merge.default</code>  &mcy;&ocy;&zhcy;&iecy;&tcy; &ncy;&acy;&zcy;&ycy;&vcy;&acy;&tcy;&softcy; &dcy;&rcy;&ucy;&gcy;&ocy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &bcy;&ucy;&dcy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &scy; &pcy;&ucy;&tcy;&yacy;&mcy;&icy;, &dcy;&lcy;&yacy; &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&khcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>merge</code>  &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-String-1"><span data-i18n="b2ef230e7f4f315a28cdcc863028da31f7110f3209feb76e76fed0f37b3d8580/47" data-source="String" onmousemove="i18n(this)">String</span></dt> <dd> <p><span data-i18n="a53c93c43a132f16dbe90ce7c089e501fb526c9524d830a3f637066262d16252/17" data-source="3-way merge is performed using the specified custom merge driver. The built-in 3-way merge driver can be explicitly specified by asking for &amp;quot;text&amp;quot; driver; the built-in &amp;quot;take the current branch&amp;quot; driver can be requested with &amp;quot;binary&amp;quot;." onmousemove="i18n(this)">&Tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&iecy;&tcy;&scy;&yacy; &scy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy;&mcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ncy;&ocy;&gcy;&ocy; &scy;&pcy;&iecy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &mcy;&ocy;&zhcy;&ncy;&ocy; &yacy;&vcy;&ncy;&ocy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;, &zcy;&acy;&pcy;&rcy;&ocy;&scy;&icy;&vcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;  &quot;text&quot; ; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;  &quot;take the current branch&quot;  &mcy;&ocy;&zhcy;&ncy;&ocy; &zcy;&acy;&pcy;&rcy;&ocy;&scy;&icy;&tcy;&softcy; &scy; &pcy;&ocy;&mcy;&ocy;&shchcy;&softcy;&yucy;  &quot;binary&quot; .</span></p> </dd> </dl> </div> </div> <div> <h4 class="text-body-emphasis"  id="_built_in_merge_drivers"><span data-i18n="f32a9cf11e2d5873bdea8d1c6fb719cf7215dea577bebedbb4c18d42a1f88aa9/e9" data-source="Built-in merge drivers" onmousemove="i18n(this)">&Vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&ycy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;</span></h4> <p><span data-i18n="41b5c6957c0d49a747308ee4871ec7eead46a387ffa14f9ceef8ebe3b8d52142/40" data-source="There are a few built-in low-level merge drivers defined that can be asked for via the &lt;code&gt;merge&lt;/code&gt; attribute." onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ocy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&khcy; &ncy;&icy;&zcy;&kcy;&ocy;&ucy;&rcy;&ocy;&vcy;&ncy;&iecy;&vcy;&ycy;&khcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&ocy;&vcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&iecy; &mcy;&ocy;&zhcy;&ncy;&ocy; &zcy;&acy;&pcy;&rcy;&ocy;&scy;&icy;&tcy;&softcy; &chcy;&iecy;&rcy;&iecy;&zcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>merge</code> .</span></p> <div> <dl> <dt id="Documentation/gitattributes.txt-text"><span data-i18n="982d9e3eb996f559e633f4d194def3761d909f5a3b647d1a851fead67c32c9d1/1d" data-source="text" onmousemove="i18n(this)">text</span></dt> <dd> <p><span data-i18n="9e787b0baaad64e49254825fc9f968bd59c4ef7ae37ea35400ab911ef4247771/23" data-source="Usual 3-way file level merge for text files. Conflicted regions are marked with conflict markers &lt;code&gt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&amp;lt;&lt;/code&gt;, &lt;code&gt;=======&lt;/code&gt; and &lt;code&gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&amp;gt;&lt;/code&gt;. The version from your branch appears before the &lt;code&gt;=======&lt;/code&gt; marker, and the version from the merged branch appears after the &lt;code&gt;=======&lt;/code&gt; marker." onmousemove="i18n(this)">&Ocy;&bcy;&ycy;&chcy;&ncy;&ocy;&iecy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &ncy;&acy; &ucy;&rcy;&ocy;&vcy;&ncy;&iecy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;. &Kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ycy;&iecy; &rcy;&iecy;&gcy;&icy;&ocy;&ncy;&ycy; &ocy;&tcy;&mcy;&iecy;&chcy;&iecy;&ncy;&ycy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&acy;&mcy;&icy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;  <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> ,  <code>=======</code>  &icy;  <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code> . &Vcy;&iecy;&rcy;&scy;&icy;&yacy; &icy;&zcy; &vcy;&acy;&shcy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&acy;&iecy;&tcy;&scy;&yacy; &pcy;&iecy;&rcy;&iecy;&dcy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&ocy;&mcy;  <code>=======</code> , &acy; &vcy;&iecy;&rcy;&scy;&icy;&yacy; &icy;&zcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&ncy;&ocy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; &mdash; &pcy;&ocy;&scy;&lcy;&iecy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&acy;  <code>=======</code> .</span></p> </dd> <dt id="Documentation/gitattributes.txt-binary"><span data-i18n="9a3a45d01531a20e89ac6ae10b0b0beb0492acd7216a368aa062d1a5fecaf9cd/59" data-source="binary" onmousemove="i18n(this)">binary</span></dt> <dd> <p><span data-i18n="70752fcccb31fba4f2834fcb73cc7968c50ce0be591f9e82000751f99c019919/2b" data-source="Keep the version from your branch in the work tree, but leave the path in the conflicted state for the user to sort out." onmousemove="i18n(this)">&Scy;&ocy;&khcy;&rcy;&acy;&ncy;&icy;&tcy;&iecy; &vcy;&iecy;&rcy;&scy;&icy;&yucy; &icy;&zcy; &scy;&vcy;&ocy;&iecy;&jcy; &vcy;&iecy;&tcy;&kcy;&icy; &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;, &ncy;&ocy; &ocy;&scy;&tcy;&acy;&vcy;&softcy;&tcy;&iecy; &pcy;&ucy;&tcy;&softcy; &vcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ocy;&mcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&icy;, &chcy;&tcy;&ocy;&bcy;&ycy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy; &mcy;&ocy;&gcy; &rcy;&acy;&zcy;&ocy;&bcy;&rcy;&acy;&tcy;&softcy;&scy;&yacy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-union"><span data-i18n="ef3ff703d7565ab5215cdbe043858f2b8a0415b2b35dd17a3da1354f86009b98/50" data-source="union" onmousemove="i18n(this)">union</span></dt> <dd> <p><span data-i18n="2ee68855517f8c53f56985ac0c54cc2d080efcf3ef8d5376a6c0406534cc5558/ba" data-source="Run 3-way file level merge for text files, but take lines from both versions, instead of leaving conflict markers. This tends to leave the added lines in the resulting file in random order and the user should verify the result. Do not use this if you do not understand the implications." onmousemove="i18n(this)">&Zcy;&acy;&pcy;&ucy;&scy;&tcy;&icy;&tcy;&iecy; &tcy;&rcy;&iecy;&khcy;&scy;&tcy;&ocy;&rcy;&ocy;&ncy;&ncy;&iecy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &ncy;&acy; &ucy;&rcy;&ocy;&vcy;&ncy;&iecy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &ncy;&ocy; &vcy;&ocy;&zcy;&softcy;&mcy;&icy;&tcy;&iecy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &icy;&zcy; &ocy;&bcy;&iecy;&icy;&khcy; &vcy;&iecy;&rcy;&scy;&icy;&jcy;, &acy; &ncy;&iecy; &ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&jcy;&tcy;&iecy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;. &Pcy;&rcy;&icy; &ecy;&tcy;&ocy;&mcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&ncy;&ycy;&iecy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &vcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&icy;&rcy;&ucy;&yucy;&shchcy;&iecy;&mcy; &fcy;&acy;&jcy;&lcy;&iecy; &ocy;&scy;&tcy;&acy;&yucy;&tcy;&scy;&yacy; &vcy; &scy;&lcy;&ucy;&chcy;&acy;&jcy;&ncy;&ocy;&mcy; &pcy;&ocy;&rcy;&yacy;&dcy;&kcy;&iecy;, &icy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&yucy; &pcy;&rcy;&icy;&khcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&yacy;&tcy;&softcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;. &Ncy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &ecy;&tcy;&ocy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &ncy;&iecy; &pcy;&ocy;&ncy;&icy;&mcy;&acy;&iecy;&tcy;&iecy; &pcy;&ocy;&scy;&lcy;&iecy;&dcy;&scy;&tcy;&vcy;&icy;&jcy;.</span></p> </dd> </dl> </div> </div> <div> <h4 class="text-body-emphasis"  id="_defining_a_custom_merge_driver"><span data-i18n="c4fbd424726fa538fa731a93499c32ed56c3a5d9405f228b320fd024819c7f0d/ce" data-source="Defining a custom merge driver" onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy; &pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&ocy;&gcy;&ocy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;</span></h4> <p><span data-i18n="52a6b6ce51c0ae1f276a6ec634bfc974d5be1fc8be3f0ec614df49f9613d30db/80" data-source="The definition of a merge driver is done in the &lt;code&gt;.git/config&lt;/code&gt; file, not in the &lt;code&gt;gitattributes&lt;/code&gt; file, so strictly speaking this manual page is a wrong place to talk about it. However&amp;hellip;&amp;ZeroWidthSpace;" onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&ocy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy;  <code>.git/config</code> , &acy; &ncy;&iecy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy;  <code>gitattributes</code> , &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy;, &scy;&tcy;&rcy;&ocy;&gcy;&ocy; &gcy;&ocy;&vcy;&ocy;&rcy;&yacy;, &ecy;&tcy;&acy; &scy;&tcy;&rcy;&acy;&ncy;&icy;&tscy;&acy; &rcy;&ucy;&kcy;&ocy;&vcy;&ocy;&dcy;&scy;&tcy;&vcy;&acy; &mdash; &ncy;&iecy;&pcy;&ocy;&dcy;&khcy;&ocy;&dcy;&yacy;&shchcy;&iecy;&iecy; &mcy;&iecy;&scy;&tcy;&ocy; &dcy;&lcy;&yacy; &ocy;&bcy;&scy;&ucy;&zhcy;&dcy;&iecy;&ncy;&icy;&yacy; &ecy;&tcy;&ocy;&gcy;&ocy; &vcy;&ocy;&pcy;&rcy;&ocy;&scy;&acy;. &Ocy;&dcy;&ncy;&acy;&kcy;&ocy;&hellip;&ZeroWidthSpace;</span></p> <p><span data-i18n="dd44669a77c9f015935e5e36be53589965f0eb468a0884f924c5407dbc7bcb1d/d4" data-source="To define a custom merge driver &lt;code&gt;filfre&lt;/code&gt;, add a section to your &lt;code&gt;$GIT_DIR/config&lt;/code&gt; file (or &lt;code&gt;$HOME/.gitconfig&lt;/code&gt; file) like this:" onmousemove="i18n(this)">&CHcy;&tcy;&ocy;&bcy;&ycy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &scy;&ocy;&bcy;&scy;&tcy;&vcy;&iecy;&ncy;&ncy;&ycy;&jcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;  <code>filfre</code> , &dcy;&ocy;&bcy;&acy;&vcy;&softcy;&tcy;&iecy; &rcy;&acy;&zcy;&dcy;&iecy;&lcy; &vcy; &fcy;&acy;&jcy;&lcy;  <code>$GIT_DIR/config</code>  (&icy;&lcy;&icy; &fcy;&acy;&jcy;&lcy;  <code>$HOME/.gitconfig</code> ), &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;:</span></p> <div> <div> <pre class="hljs language-ini"><span class="hljs-section">[merge &quot;filfre&quot;]</span>
        <span class="hljs-attr">name</span> = feel-free merge driver
        <span class="hljs-attr">driver</span> = filfre %O %A %B %L %P
        <span class="hljs-attr">recursive</span> = binary</pre> </div> </div> <p><span data-i18n="1bb222a31ee1215d7b3a1dd1a61bea065cf44d8862ab178fc28af3abbd27f70d/0c" data-source="The &lt;code&gt;merge.*.name&lt;/code&gt; variable gives the driver a human-readable name." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy;  <code>merge.*.name</code>  &dcy;&acy;&iecy;&tcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy;&ucy; &ucy;&dcy;&ocy;&bcy;&ocy;&chcy;&icy;&tcy;&acy;&iecy;&mcy;&ocy;&iecy; &icy;&mcy;&yacy;.</span></p> <p><span data-i18n="c691e7dd8a99d78db50f7be1a3b042052751b291624a498f1269641aca380e64/00" data-source="The &lt;code&gt;merge.*.driver&lt;/code&gt; variable&amp;rsquo;s value is used to construct a command to run to merge ancestor&amp;rsquo;s version (&lt;code&gt;%O&lt;/code&gt;), current version (&lt;code&gt;%A&lt;/code&gt;) and the other branches&amp;apos; version (&lt;code&gt;%B&lt;/code&gt;). These three tokens are replaced with the names of temporary files that hold the contents of these versions when the command line is built. Additionally, %L will be replaced with the conflict marker size (see below)." onmousemove="i18n(this)">&Zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy;  <code>merge.*.driver</code>  &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&yacy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ycy;, &zcy;&acy;&pcy;&ucy;&scy;&kcy;&acy;&iecy;&mcy;&ocy;&jcy; &dcy;&lcy;&yacy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&iecy;&ncy;&icy;&yacy; &vcy;&iecy;&rcy;&scy;&icy;&icy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy; (  <code>%O</code>  ), &tcy;&iecy;&kcy;&ucy;&shchcy;&iecy;&jcy; &vcy;&iecy;&rcy;&scy;&icy;&icy; (  <code>%A</code>  ) &icy; &vcy;&iecy;&rcy;&scy;&icy;&icy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &vcy;&iecy;&tcy;&vcy;&iecy;&jcy; (  <code>%B</code>  ). &Ecy;&tcy;&icy; &tcy;&rcy;&icy; &tcy;&ocy;&kcy;&iecy;&ncy;&acy; &zcy;&acy;&mcy;&iecy;&ncy;&yacy;&yucy;&tcy;&scy;&yacy; &icy;&mcy;&iecy;&ncy;&acy;&mcy;&icy; &vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ycy;&khcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;, &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&acy;&shchcy;&icy;&khcy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&iecy; &ecy;&tcy;&icy;&khcy; &vcy;&iecy;&rcy;&scy;&icy;&jcy;, &pcy;&rcy;&icy; &pcy;&ocy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&icy;&icy; &kcy;&ocy;&mcy;&acy;&ncy;&dcy;&ncy;&ocy;&jcy; &scy;&tcy;&rcy;&ocy;&kcy;&icy;. &Kcy;&rcy;&ocy;&mcy;&iecy; &tcy;&ocy;&gcy;&ocy;, %L &bcy;&ucy;&dcy;&iecy;&tcy; &zcy;&acy;&mcy;&iecy;&ncy;&iecy;&ncy; &rcy;&acy;&zcy;&mcy;&iecy;&rcy;&ocy;&mcy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&acy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy; (&scy;&mcy;. &ncy;&icy;&zhcy;&iecy;).</span></p> <p><span data-i18n="0051321fb3c66ca52d529620d46c5d61081c7dadc7b3f0c802fb03339b0fda30/6a" data-source="The merge driver is expected to leave the result of the merge in the file named with &lt;code&gt;%A&lt;/code&gt; by overwriting it, and exit with zero status if it managed to merge them cleanly, or non-zero if there were conflicts. When the driver crashes (e.g. killed by SEGV), it is expected to exit with non-zero status that are higher than 128, and in such a case, the merge results in a failure (which is different from producing a conflict)." onmousemove="i18n(this)">&Ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &ocy;&scy;&tcy;&acy;&vcy;&icy;&tcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy; &scy; &icy;&mcy;&iecy;&ncy;&iecy;&mcy;  <code>%A</code> , &pcy;&iecy;&rcy;&iecy;&zcy;&acy;&pcy;&icy;&scy;&acy;&vcy; &iecy;&gcy;&ocy;, &icy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&icy;&tcy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy; &scy; &ncy;&ucy;&lcy;&iecy;&vcy;&ycy;&mcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;&ocy;&mcy;, &iecy;&scy;&lcy;&icy; &iecy;&mcy;&ucy; &ucy;&dcy;&acy;&lcy;&ocy;&scy;&softcy; &ocy;&bcy;&hardcy;&iecy;&dcy;&icy;&ncy;&icy;&tcy;&softcy; &icy;&khcy; &bcy;&iecy;&zcy; &ocy;&shcy;&icy;&bcy;&ocy;&kcy;, &icy;&lcy;&icy; &scy; &ncy;&iecy;&ncy;&ucy;&lcy;&iecy;&vcy;&ycy;&mcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;&ocy;&mcy;, &iecy;&scy;&lcy;&icy; &vcy;&ocy;&zcy;&ncy;&icy;&kcy;&lcy;&icy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ycy;. &Kcy;&ocy;&gcy;&dcy;&acy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &vcy;&ycy;&khcy;&ocy;&dcy;&icy;&tcy; &icy;&zcy; &scy;&tcy;&rcy;&ocy;&yacy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &ucy;&ncy;&icy;&chcy;&tcy;&ocy;&zhcy;&acy;&iecy;&tcy;&scy;&yacy; SEGV), &ocy;&zhcy;&icy;&dcy;&acy;&iecy;&tcy;&scy;&yacy;, &chcy;&tcy;&ocy; &ocy;&ncy; &zcy;&acy;&vcy;&iecy;&rcy;&shcy;&icy;&tcy; &rcy;&acy;&bcy;&ocy;&tcy;&ucy; &scy; &ncy;&iecy;&ncy;&ucy;&lcy;&iecy;&vcy;&ycy;&mcy; &scy;&tcy;&acy;&tcy;&ucy;&scy;&ocy;&mcy;, &pcy;&rcy;&iecy;&vcy;&ycy;&shcy;&acy;&yucy;&shchcy;&icy;&mcy; 128, &icy; &vcy; &tcy;&acy;&kcy;&ocy;&mcy; &scy;&lcy;&ucy;&chcy;&acy;&iecy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy; &scy;&bcy;&ocy;&yucy; (&chcy;&tcy;&ocy; &ocy;&tcy;&lcy;&icy;&chcy;&acy;&iecy;&tcy;&scy;&yacy; &ocy;&tcy; &vcy;&ocy;&zcy;&ncy;&icy;&kcy;&ncy;&ocy;&vcy;&iecy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;).</span></p> <p><span data-i18n="48b7a6d3147f71ac6e344eea5c9bbc97b5dfaab1ed58a242f2778f9bd88b1010/5a" data-source="The &lt;code&gt;merge.*.recursive&lt;/code&gt; variable specifies what other merge driver to use when the merge driver is called for an internal merge between common ancestors, when there are more than one. When left unspecified, the driver itself is used for both internal merge and the final merge." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy;  <code>merge.*.recursive</code>  &ucy;&kcy;&acy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;, &kcy;&acy;&kcy;&ocy;&jcy; &iecy;&shchcy;&iecy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;, &kcy;&ocy;&gcy;&dcy;&acy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &vcy;&ycy;&zcy;&ycy;&vcy;&acy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &vcy;&ncy;&ucy;&tcy;&rcy;&iecy;&ncy;&ncy;&iecy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &mcy;&iecy;&zhcy;&dcy;&ucy; &ocy;&bcy;&shchcy;&icy;&mcy;&icy; &pcy;&rcy;&iecy;&dcy;&kcy;&acy;&mcy;&icy;, &iecy;&scy;&lcy;&icy; &icy;&khcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy;. &IEcy;&scy;&lcy;&icy; &ecy;&tcy;&ocy;&tcy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy; &ncy;&iecy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;, &scy;&acy;&mcy; &dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &kcy;&acy;&kcy; &dcy;&lcy;&yacy; &vcy;&ncy;&ucy;&tcy;&rcy;&iecy;&ncy;&ncy;&iecy;&gcy;&ocy;, &tcy;&acy;&kcy; &icy; &dcy;&lcy;&yacy; &ocy;&kcy;&ocy;&ncy;&chcy;&acy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;.</span></p> <p><span data-i18n="280248652c3f3f3bfb1a948d4c27aaa574e07804addb9eac6d22ba2a498b9129/02" data-source="The merge driver can learn the pathname in which the merged result will be stored via placeholder &lt;code&gt;%P&lt;/code&gt;." onmousemove="i18n(this)">&Dcy;&rcy;&acy;&jcy;&vcy;&iecy;&rcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &mcy;&ocy;&zhcy;&iecy;&tcy; &ucy;&zcy;&ncy;&acy;&tcy;&softcy; &pcy;&ucy;&tcy;&softcy;, &vcy; &kcy;&ocy;&tcy;&ocy;&rcy;&ocy;&mcy; &bcy;&ucy;&dcy;&iecy;&tcy; &scy;&ocy;&khcy;&rcy;&acy;&ncy;&iecy;&ncy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;, &chcy;&iecy;&rcy;&iecy;&zcy; &zcy;&acy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;  <code>%P</code> .</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_conflict_marker_size">
<code>conflict-marker-size</code>
</h4> <p><span data-i18n="bbff6cd6c471d2a7698fe671ca0e4fe49b7d56ba9e8567852dc63fb18cab494f/ee" data-source="This attribute controls the length of conflict markers left in the work tree file during a conflicted merge. Only a positive integer has a meaningful effect." onmousemove="i18n(this)">&Ecy;&tcy;&ocy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &ucy;&pcy;&rcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy; &dcy;&lcy;&icy;&ncy;&ocy;&jcy; &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&ocy;&vcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;, &ocy;&scy;&tcy;&acy;&yucy;&shchcy;&icy;&khcy;&scy;&yacy; &vcy; &fcy;&acy;&jcy;&lcy;&iecy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &vcy;&ocy; &vcy;&rcy;&iecy;&mcy;&yacy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ncy;&ocy;&gcy;&ocy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy;. &Tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &pcy;&ocy;&lcy;&ocy;&zhcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&iecy; &tscy;&iecy;&lcy;&ocy;&iecy; &chcy;&icy;&scy;&lcy;&ocy; &icy;&mcy;&iecy;&iecy;&tcy; &zcy;&ncy;&acy;&chcy;&icy;&mcy;&ycy;&jcy; &ecy;&fcy;&fcy;&iecy;&kcy;&tcy;.</span></p> <p><span data-i18n="3762104af55775a562e743e7eec31b1e4d20d5e08006efb1896cb7ee7b4b4ac9/76" data-source="For example, this line in &lt;code&gt;.gitattributes&lt;/code&gt; can be used to tell the merge machinery to leave much longer (instead of the usual 7-character-long) conflict markers when merging the file &lt;code&gt;Documentation/git-merge.txt&lt;/code&gt; results in a conflict." onmousemove="i18n(this)">&Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &ecy;&tcy;&ucy; &scy;&tcy;&rcy;&ocy;&kcy;&ucy; &vcy;  <code>.gitattributes</code>  &mcy;&ocy;&zhcy;&ncy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;, &chcy;&tcy;&ocy;&bcy;&ycy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy; &mcy;&iecy;&khcy;&acy;&ncy;&icy;&zcy;&mcy;&ucy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&yacy; &ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&tcy;&softcy; &gcy;&ocy;&rcy;&acy;&zcy;&dcy;&ocy; &bcy;&ocy;&lcy;&iecy;&iecy; &dcy;&lcy;&icy;&ncy;&ncy;&ycy;&iecy; (&vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ocy;&bcy;&ycy;&chcy;&ncy;&ycy;&khcy; 7-&scy;&icy;&mcy;&vcy;&ocy;&lcy;&softcy;&ncy;&ycy;&khcy;) &mcy;&acy;&rcy;&kcy;&iecy;&rcy;&ycy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&acy;, &kcy;&ocy;&gcy;&dcy;&acy; &scy;&lcy;&icy;&yacy;&ncy;&icy;&iecy; &fcy;&acy;&jcy;&lcy;&acy;  <code>Documentation/git-merge.txt</code>  &pcy;&rcy;&icy;&vcy;&ocy;&dcy;&icy;&tcy; &kcy; &kcy;&ocy;&ncy;&fcy;&lcy;&icy;&kcy;&tcy;&ucy;.</span></p> <div> <div> <pre class="hljs language-bash">Documentation/git-merge.txt        conflict-marker-size=32</pre> </div> </div> </div> </div> <div> <h3 class="text-body-emphasis"  id="_checking_whitespace_errors"><span data-i18n="c93ef905dd77569b7eba7b45b7a2b3f121eb2d71f527498cb1b3067974676725/a4" data-source="Checking whitespace errors" onmousemove="i18n(this)">&Pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&kcy;&acy; &ocy;&shcy;&icy;&bcy;&ocy;&kcy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&ocy;&vcy;</span></h3> <div> <h4 class="text-body-emphasis"  id="_whitespace">
<code>whitespace</code>
</h4> <p><span data-i18n="c321785987945308e0fa35ede62ee9f046e07e7499e072de0f8e2dd1dd391ce5/67" data-source="The &lt;code&gt;core.whitespace&lt;/code&gt; configuration variable allows you to define what &lt;code&gt;diff&lt;/code&gt; and &lt;code&gt;apply&lt;/code&gt; should consider whitespace errors for all paths in the project (See &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt;). This attribute gives you finer control per path." onmousemove="i18n(this)">&Pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>core.whitespace</code>  &pcy;&ocy;&zcy;&vcy;&ocy;&lcy;&yacy;&iecy;&tcy; &vcy;&acy;&mcy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy;, &kcy;&acy;&kcy;&icy;&iecy;  <code>diff</code>  &icy;  <code>apply</code>  &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &ucy;&chcy;&icy;&tcy;&ycy;&vcy;&acy;&tcy;&softcy; &ocy;&shcy;&icy;&bcy;&kcy;&icy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&ocy;&vcy; &dcy;&lcy;&yacy; &vcy;&scy;&iecy;&khcy; &pcy;&ucy;&tcy;&iecy;&jcy; &vcy; &pcy;&rcy;&ocy;&iecy;&kcy;&tcy;&iecy; (&scy;&mcy;.  <a href="git-config.html">git-config[1]</a> ). &Ecy;&tcy;&ocy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &dcy;&acy;&iecy;&tcy; &vcy;&acy;&mcy; &bcy;&ocy;&lcy;&iecy;&iecy; &tcy;&ocy;&chcy;&ncy;&ycy;&jcy; &kcy;&ocy;&ncy;&tcy;&rcy;&ocy;&lcy;&softcy; &ncy;&acy;&dcy; &kcy;&acy;&zhcy;&dcy;&ycy;&mcy; &pcy;&ucy;&tcy;&iecy;&mcy;.</span></p> <div> <dl> <dt id="Documentation/gitattributes.txt-Set-1-1-1-1"><span data-i18n="b6f6f3ad07b3c05fa0bbbbf2e3d257ff1e3e31a83efbe2c9369cd008594f94e0/14" data-source="Set" onmousemove="i18n(this)">Set</span></dt> <dd> <p><span data-i18n="03fb254245f04ecc18f3e56e84add4a29007556f1ee469a2dfabaedda46a9afa/2c" data-source="Notice all types of potential whitespace errors known to Git. The tab width is taken from the value of the &lt;code&gt;core.whitespace&lt;/code&gt; configuration variable." onmousemove="i18n(this)">&Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy; &ncy;&acy; &vcy;&scy;&iecy; &tcy;&icy;&pcy;&ycy; &pcy;&ocy;&tcy;&iecy;&ncy;&tscy;&icy;&acy;&lcy;&softcy;&ncy;&ycy;&khcy; &ocy;&shcy;&icy;&bcy;&ocy;&kcy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&ocy;&vcy;, &icy;&zcy;&vcy;&iecy;&scy;&tcy;&ncy;&ycy;&iecy; Git. &SHcy;&icy;&rcy;&icy;&ncy;&acy; &tcy;&acy;&bcy;&ucy;&lcy;&yacy;&tscy;&icy;&icy; &bcy;&iecy;&rcy;&iecy;&tcy;&scy;&yacy; &icy;&zcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&yacy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>core.whitespace</code> .</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unset-1-1-1-1"><span data-i18n="8d2dd4e8c7caa1acb407c161aad48d1201e93e0f6dcf54c8f19ae6fb3fd15127/b7" data-source="Unset" onmousemove="i18n(this)">Unset</span></dt> <dd> <p><span data-i18n="26011b676ee14be19aae41ece0126b4be3fa0ba43064f071434afddd2c9f2848/04" data-source="Do not notice anything as error." onmousemove="i18n(this)">&Ncy;&icy;&chcy;&iecy;&gcy;&ocy; &ncy;&iecy; &zcy;&acy;&mcy;&iecy;&chcy;&acy;&jcy;&tcy;&iecy; &kcy;&acy;&kcy; &ocy;&shcy;&icy;&bcy;&kcy;&ucy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-Unspecified-1-1-1-1-1"><span data-i18n="5b8aa0bf3c59daec38e2d0c690a1a62513208d1e2075dad62a32ca0b9440b1a1/dd" data-source="Unspecified" onmousemove="i18n(this)">Unspecified</span></dt> <dd> <p><span data-i18n="954d08aa29366ef3dde85fe38df392b1ac9912d16a1acc476b4617ed43d80901/83" data-source="Use the value of the &lt;code&gt;core.whitespace&lt;/code&gt; configuration variable to decide what to notice as error." onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&jcy;&tcy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>core.whitespace</code> , &chcy;&tcy;&ocy;&bcy;&ycy; &rcy;&iecy;&shcy;&icy;&tcy;&softcy;, &chcy;&tcy;&ocy; &scy;&chcy;&icy;&tcy;&acy;&tcy;&softcy; &ocy;&shcy;&icy;&bcy;&kcy;&ocy;&jcy;.</span></p> </dd> <dt id="Documentation/gitattributes.txt-String-1-1"><span data-i18n="b2ef230e7f4f315a28cdcc863028da31f7110f3209feb76e76fed0f37b3d8580/47" data-source="String" onmousemove="i18n(this)">String</span></dt> <dd> <p><span data-i18n="7d4029a6013c314b0920556cf7fd478570aa491a524d0a3eae1ca8be8c1e3338/3a" data-source="Specify a comma separated list of common whitespace problems to notice in the same format as the &lt;code&gt;core.whitespace&lt;/code&gt; configuration variable." onmousemove="i18n(this)">&Ucy;&kcy;&acy;&zhcy;&icy;&tcy;&iecy; &scy;&pcy;&icy;&scy;&ocy;&kcy; &rcy;&acy;&scy;&pcy;&rcy;&ocy;&scy;&tcy;&rcy;&acy;&ncy;&iecy;&ncy;&ncy;&ycy;&khcy; &pcy;&rcy;&ocy;&bcy;&lcy;&iecy;&mcy; &scy; &pcy;&rcy;&ocy;&bcy;&iecy;&lcy;&acy;&mcy;&icy;, &rcy;&acy;&zcy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ycy;&khcy; &zcy;&acy;&pcy;&yacy;&tcy;&ycy;&mcy;&icy;, &vcy; &tcy;&ocy;&mcy; &zhcy;&iecy; &fcy;&ocy;&rcy;&mcy;&acy;&tcy;&iecy;, &chcy;&tcy;&ocy; &icy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&acy;&yacy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>core.whitespace</code> .</span></p> </dd> </dl> </div> </div> </div> <div> <h3 class="text-body-emphasis"  id="_creating_an_archive"><span data-i18n="f62496b732ec333758b174276fa95d654496fd35a7d366982c933ae31e1a9f72/9a" data-source="Creating an archive" onmousemove="i18n(this)">&Scy;&ocy;&zcy;&dcy;&acy;&ncy;&icy;&iecy; &acy;&rcy;&khcy;&icy;&vcy;&acy;</span></h3> <div> <h4 class="text-body-emphasis"  id="_export_ignore">
<code>export-ignore</code>
</h4> <p><span data-i18n="80385f86053881ce2a5c2277a171c26130aaeaaf729f1948446d588cad75a48c/1d" data-source="Files and directories with the attribute &lt;code&gt;export-ignore&lt;/code&gt; won&amp;rsquo;t be added to archive files." onmousemove="i18n(this)">&Fcy;&acy;&jcy;&lcy;&ycy; &icy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&icy; &scy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&mcy;  <code>export-ignore</code>  &ncy;&iecy; &bcy;&ucy;&dcy;&ucy;&tcy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&ycy; &vcy; &acy;&rcy;&khcy;&icy;&vcy;&ncy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy;.</span></p> </div> <div> <h4 class="text-body-emphasis"  id="_export_subst">
<code>export-subst</code>
</h4> <p><span data-i18n="34047d9c13f809ce83b152bead89402dc864071e5e1aa4c86645b62178518f54/74" data-source="If the attribute &lt;code&gt;export-subst&lt;/code&gt; is set for a file then Git will expand several placeholders when adding this file to an archive. The expansion depends on the availability of a commit ID, i.e., if &lt;a href=&quot;git-archive&quot;&gt;git-archive[1]&lt;/a&gt; has been given a tree instead of a commit or a tag then no replacement will be done. The placeholders are the same as those for the option &lt;code&gt;--pretty=format:&lt;/code&gt; of &lt;a href=&quot;git-log&quot;&gt;git-log[1]&lt;/a&gt;, except that they need to be wrapped like this: &lt;code&gt;$Format:PLACEHOLDERS$&lt;/code&gt; in the file. E.g. the string &lt;code&gt;$Format:%H$&lt;/code&gt; will be replaced by the commit hash. However, only one &lt;code&gt;%(describe)&lt;/code&gt; placeholder is expanded per archive to avoid denial-of-service attacks." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &dcy;&lcy;&yacy; &fcy;&acy;&jcy;&lcy;&acy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>export-subst</code> , &tcy;&ocy;  Git  &rcy;&acy;&scy;&shcy;&icy;&rcy;&icy;&tcy; &ncy;&iecy;&scy;&kcy;&ocy;&lcy;&softcy;&kcy;&ocy; &zcy;&acy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&iecy;&jcy; &pcy;&rcy;&icy; &dcy;&ocy;&bcy;&acy;&vcy;&lcy;&iecy;&ncy;&icy;&icy; &ecy;&tcy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy; &vcy; &acy;&rcy;&khcy;&icy;&vcy;. &Rcy;&acy;&scy;&shcy;&icy;&rcy;&iecy;&ncy;&icy;&iecy; &zcy;&acy;&vcy;&icy;&scy;&icy;&tcy; &ocy;&tcy; &ncy;&acy;&lcy;&icy;&chcy;&icy;&yacy; &icy;&dcy;&iecy;&ncy;&tcy;&icy;&fcy;&icy;&kcy;&acy;&tcy;&ocy;&rcy;&acy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;, &tcy;. &iecy;. &iecy;&scy;&lcy;&icy;  <a href="git-archive.html">git-archive[1]</a>  &bcy;&ycy;&lcy;&ocy; &pcy;&rcy;&icy;&scy;&vcy;&ocy;&iecy;&ncy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&ocy; &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy; &icy;&lcy;&icy; &tcy;&iecy;&gcy;&acy;, &tcy;&ocy; &zcy;&acy;&mcy;&iecy;&ncy;&acy; &ncy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&iecy;&ncy;&acy;. &Zcy;&acy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&icy; &tcy;&acy;&kcy;&icy;&iecy; &zhcy;&iecy;, &kcy;&acy;&kcy; &icy; &dcy;&lcy;&yacy; &ocy;&pcy;&tscy;&icy;&icy;  <code>--pretty=format:</code>  &icy;&zcy;  <a href="git-log.html">git-log[1]</a> , &zcy;&acy; &icy;&scy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&iecy;&mcy; &tcy;&ocy;&gcy;&ocy;, &chcy;&tcy;&ocy; &icy;&khcy; &ncy;&ucy;&zhcy;&ncy;&ocy; &ocy;&bcy;&iecy;&rcy;&ncy;&ucy;&tcy;&softcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;:  <code>$Format:PLACEHOLDERS$</code>  &vcy; &fcy;&acy;&jcy;&lcy;&iecy;. &Ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;, &scy;&tcy;&rcy;&ocy;&kcy;&acy;  <code>$Format:%H$</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &zcy;&acy;&mcy;&iecy;&ncy;&iecy;&ncy;&acy; &khcy;&iecy;&shcy;&iecy;&mcy; &fcy;&icy;&kcy;&scy;&acy;&tscy;&icy;&icy;. &Ocy;&dcy;&ncy;&acy;&kcy;&ocy; &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&gcy;&ocy; &acy;&rcy;&khcy;&icy;&vcy;&acy; &rcy;&acy;&scy;&shcy;&icy;&rcy;&yacy;&iecy;&tcy;&scy;&yacy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &ocy;&dcy;&icy;&ncy; &zcy;&acy;&pcy;&ocy;&lcy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;  <code>%(describe)</code> , &chcy;&tcy;&ocy;&bcy;&ycy; &icy;&zcy;&bcy;&iecy;&zhcy;&acy;&tcy;&softcy; &acy;&tcy;&acy;&kcy; &tcy;&icy;&pcy;&acy; &laquo;&ocy;&tcy;&kcy;&acy;&zcy; &vcy; &ocy;&bcy;&scy;&lcy;&ucy;&zhcy;&icy;&vcy;&acy;&ncy;&icy;&icy;&raquo;.</span></p> </div> </div> <div> <h3 class="text-body-emphasis"  id="_packing_objects"><span data-i18n="fb8aea0f0083cad1826a326fdcb43392c47df273e9d609b94f87a0f8259b10dc/0f" data-source="Packing objects" onmousemove="i18n(this)">Packing objects</span></h3> <div> <h4 class="text-body-emphasis"  id="_delta">
<code>delta</code>
</h4> <p><span data-i18n="3a908a1bcef55002cbfa99736349f1fbb8f1d2e1a9a39f546005d27770e64cc0/82" data-source="Delta compression will not be attempted for blobs for paths with the attribute &lt;code&gt;delta&lt;/code&gt; set to false." onmousemove="i18n(this)">&Dcy;&iecy;&lcy;&softcy;&tcy;&acy;-&scy;&zhcy;&acy;&tcy;&icy;&iecy; &ncy;&iecy; &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&ycy;&pcy;&ocy;&lcy;&ncy;&yacy;&tcy;&softcy;&scy;&yacy; &dcy;&lcy;&yacy; &bcy;&ocy;&lcy;&softcy;&shcy;&icy;&khcy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ycy;&khcy; &ocy;&bcy;&hardcy;&iecy;&kcy;&tcy;&ocy;&vcy; &dcy;&lcy;&yacy; &pcy;&ucy;&tcy;&iecy;&jcy; &scy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&mcy;  <code>delta</code> , &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ncy;&ycy;&mcy; &vcy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; false.</span></p> </div> </div> <div> <h3 class="text-body-emphasis"  id="_viewing_files_in_gui_tools"><span data-i18n="c09b2db0f90b5b1b406e8d5c8049ec4358084cdd8320c0cef0bfe28181ee4670/55" data-source="Viewing files in GUI tools" onmousemove="i18n(this)">&Pcy;&rcy;&ocy;&scy;&mcy;&ocy;&tcy;&rcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy; &vcy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&khcy; &gcy;&rcy;&acy;&fcy;&icy;&chcy;&iecy;&scy;&kcy;&ocy;&gcy;&ocy; &icy;&ncy;&tcy;&iecy;&rcy;&fcy;&iecy;&jcy;&scy;&acy;</span></h3> <div> <h4 class="text-body-emphasis"  id="_encoding">
<code>encoding</code>
</h4> <p><span data-i18n="e529e61beb830d2325c90a87e1c153e5df28fcdafd612680064ec1de90d6ed1f/86" data-source="The value of this attribute specifies the character encoding that should be used by GUI tools (e.g. &lt;a href=&quot;gitk&quot;&gt;gitk[1]&lt;/a&gt; and &lt;a href=&quot;git-gui&quot;&gt;git-gui[1]&lt;/a&gt;) to display the contents of the relevant file. Note that due to performance considerations &lt;a href=&quot;gitk&quot;&gt;gitk[1]&lt;/a&gt; does not use this attribute unless you manually enable per-file encodings in its options." onmousemove="i18n(this)">&Zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &ecy;&tcy;&ocy;&gcy;&ocy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&yacy;&iecy;&tcy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&ucy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&ocy;&vcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&acy;&yacy; &dcy;&ocy;&lcy;&zhcy;&ncy;&acy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&softcy;&scy;&yacy; &icy;&ncy;&scy;&tcy;&rcy;&ucy;&mcy;&iecy;&ncy;&tcy;&acy;&mcy;&icy; &scy; &gcy;&rcy;&acy;&fcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&mcy; &icy;&ncy;&tcy;&iecy;&rcy;&fcy;&iecy;&jcy;&scy;&ocy;&mcy; (&ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;,  <a href="gitk.html">gitk[1]</a>  &icy;  <a href="git-gui.html">git-gui[1]</a> ) &dcy;&lcy;&yacy; &ocy;&tcy;&ocy;&bcy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&yacy; &scy;&ocy;&dcy;&iecy;&rcy;&zhcy;&icy;&mcy;&ocy;&gcy;&ocy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&yucy;&shchcy;&iecy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy;. &Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &icy;&zcy; &scy;&ocy;&ocy;&bcy;&rcy;&acy;&zhcy;&iecy;&ncy;&icy;&jcy; &pcy;&rcy;&ocy;&icy;&zcy;&vcy;&ocy;&dcy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ocy;&scy;&tcy;&icy;  <a href="gitk.html">gitk[1]</a>  &ncy;&iecy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy; &ecy;&tcy;&ocy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;, &iecy;&scy;&lcy;&icy; &vcy;&ycy; &vcy;&rcy;&ucy;&chcy;&ncy;&ucy;&yucy; &ncy;&iecy; &vcy;&kcy;&lcy;&yucy;&chcy;&icy;&tcy;&iecy; &kcy;&ocy;&dcy;&icy;&rcy;&ocy;&vcy;&kcy;&ucy; &dcy;&lcy;&yacy; &kcy;&acy;&zhcy;&dcy;&ocy;&gcy;&ocy; &fcy;&acy;&jcy;&lcy;&acy; &vcy; &iecy;&gcy;&ocy; &pcy;&acy;&rcy;&acy;&mcy;&iecy;&tcy;&rcy;&acy;&khcy;.</span></p> <p><span data-i18n="deae3da3d5631253018c3499d67e6b0b1615882cbe58a8edf0d50c024b1dde0b/73" data-source="If this attribute is not set or has an invalid value, the value of the &lt;code&gt;gui.encoding&lt;/code&gt; configuration variable is used instead (See &lt;a href=&quot;git-config&quot;&gt;git-config[1]&lt;/a&gt;)." onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &ecy;&tcy;&ocy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy; &icy;&lcy;&icy; &icy;&mcy;&iecy;&iecy;&tcy; &ncy;&iecy;&dcy;&ocy;&pcy;&ucy;&scy;&tcy;&icy;&mcy;&ocy;&iecy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy;, &vcy;&mcy;&iecy;&scy;&tcy;&ocy; &ncy;&iecy;&gcy;&ocy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &pcy;&iecy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy;&jcy; &kcy;&ocy;&ncy;&fcy;&icy;&gcy;&ucy;&rcy;&acy;&tscy;&icy;&icy;  <code>gui.encoding</code>  (&scy;&mcy;.  <a href="git-config.html">git-config[1]</a> ).</span></p> </div> </div> </div> <h2 class="text-body-emphasis"  id="_using_macro_attributes"><span data-i18n="fd26bb1bf93c8672fe84dc8ab12217393ac3186dbae0d5a2bdcc9ef0a232a71d/95" data-source="Using macro attributes" onmousemove="i18n(this)">&Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy; &mcy;&acy;&kcy;&rcy;&ocy;&scy;&acy;</span></h2> <div> <p><span data-i18n="f40646e24878307a7948af74a32ffb15028fb0f0d42fced93aaf25293d94421c/fc" data-source="You do not want any end-of-line conversions applied to, nor textual diffs produced for, any binary file you track. You would need to specify e.g." onmousemove="i18n(this)">&Vcy;&ycy; &ncy;&iecy; &khcy;&ocy;&tcy;&icy;&tcy;&iecy;, &chcy;&tcy;&ocy;&bcy;&ycy; &kcy; &lcy;&yucy;&bcy;&ocy;&mcy;&ucy; &dcy;&vcy;&ocy;&icy;&chcy;&ncy;&ocy;&mcy;&ucy; &fcy;&acy;&jcy;&lcy;&ucy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &vcy;&ycy; &ocy;&tcy;&scy;&lcy;&iecy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy;&iecy;, &pcy;&rcy;&icy;&mcy;&iecy;&ncy;&yacy;&lcy;&icy;&scy;&softcy; &kcy;&acy;&kcy;&icy;&iecy;-&lcy;&icy;&bcy;&ocy; &pcy;&rcy;&iecy;&ocy;&bcy;&rcy;&acy;&zcy;&ocy;&vcy;&acy;&ncy;&icy;&yacy; &kcy;&ocy;&ncy;&tscy;&acy; &scy;&tcy;&rcy;&ocy;&kcy;&icy; &icy;&lcy;&icy; &scy;&ocy;&zcy;&dcy;&acy;&vcy;&acy;&lcy;&icy;&scy;&softcy; &tcy;&iecy;&kcy;&scy;&tcy;&ocy;&vcy;&ycy;&iecy; &rcy;&acy;&zcy;&lcy;&icy;&chcy;&icy;&yacy;. &Vcy;&acy;&mcy; &ncy;&ucy;&zhcy;&ncy;&ocy; &bcy;&ucy;&dcy;&iecy;&tcy; &ucy;&kcy;&acy;&zcy;&acy;&tcy;&softcy;, &ncy;&acy;&pcy;&rcy;&icy;&mcy;&iecy;&rcy;</span></p> <div> <div> <pre class="hljs language-scss">*<span class="hljs-selector-class">.jpg</span> -text -diff</pre> </div> </div> <p><span data-i18n="990afb354b948a447fe561a813aa0de9cb5f9557a03974bbcb1bf76c51139819/9e" data-source="but that may become cumbersome, when you have many attributes. Using macro attributes, you can define an attribute that, when set, also sets or unsets a number of other attributes at the same time. The system knows a built-in macro attribute, &lt;code&gt;binary&lt;/code&gt;:" onmousemove="i18n(this)">&ncy;&ocy; &ecy;&tcy;&ocy; &mcy;&ocy;&zhcy;&iecy;&tcy; &scy;&tcy;&acy;&tcy;&softcy; &ocy;&bcy;&rcy;&iecy;&mcy;&iecy;&ncy;&icy;&tcy;&iecy;&lcy;&softcy;&ncy;&ycy;&mcy;, &iecy;&scy;&lcy;&icy; &ucy; &vcy;&acy;&scy; &mcy;&ncy;&ocy;&gcy;&ocy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy;. &Icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&yacy; &mcy;&acy;&kcy;&rcy;&ocy;&acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;, &vcy;&ycy; &mcy;&ocy;&zhcy;&iecy;&tcy;&iecy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;, &kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy;, &iecy;&scy;&lcy;&icy; &ocy;&ncy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;, &ocy;&dcy;&ncy;&ocy;&vcy;&rcy;&iecy;&mcy;&iecy;&ncy;&ncy;&ocy; &ucy;&scy;&tcy;&acy;&ncy;&acy;&vcy;&lcy;&icy;&vcy;&acy;&iecy;&tcy; &icy;&lcy;&icy; &ocy;&tcy;&mcy;&iecy;&ncy;&yacy;&iecy;&tcy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&jcy;&kcy;&ucy; &rcy;&yacy;&dcy;&acy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy;. &Scy;&icy;&scy;&tcy;&iecy;&mcy;&acy; &zcy;&ncy;&acy;&iecy;&tcy; &vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&jcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &mcy;&acy;&kcy;&rcy;&ocy;&scy;&acy;  <code>binary</code> :</span></p> <div> <div> <pre class="hljs language-php">*.jpg <span class="hljs-keyword">binary</span></pre> </div> </div> <p><span data-i18n="2b53112a96bd6c49d0a305b23817e55c5738c405500b0e428413fe625d6e6e0f/bf" data-source="Setting the &amp;quot;binary&amp;quot; attribute also unsets the &amp;quot;text&amp;quot; and &amp;quot;diff&amp;quot; attributes as above. Note that macro attributes can only be &amp;quot;Set&amp;quot;, though setting one might have the effect of setting or unsetting other attributes or even returning other attributes to the &amp;quot;Unspecified&amp;quot; state." onmousemove="i18n(this)">&Ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&kcy;&acy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&acy;  &quot;binary&quot;  &tcy;&acy;&kcy;&zhcy;&iecy; &scy;&bcy;&rcy;&acy;&scy;&ycy;&vcy;&acy;&iecy;&tcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;  &quot;text&quot;  &icy;  &quot;diff&quot; , &kcy;&acy;&kcy; &ucy;&kcy;&acy;&zcy;&acy;&ncy;&ocy; &vcy;&ycy;&shcy;&iecy;. &Ocy;&bcy;&rcy;&acy;&tcy;&icy;&tcy;&iecy; &vcy;&ncy;&icy;&mcy;&acy;&ncy;&icy;&iecy;, &chcy;&tcy;&ocy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy; &mcy;&acy;&kcy;&rcy;&ocy;&scy;&acy; &mcy;&ocy;&gcy;&ucy;&tcy; &bcy;&ycy;&tcy;&softcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy;  &quot;Set&quot; , &khcy;&ocy;&tcy;&yacy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&kcy;&acy; &ocy;&dcy;&ncy;&ocy;&gcy;&ocy; &icy;&zcy; &ncy;&icy;&khcy; &mcy;&ocy;&zhcy;&iecy;&tcy; &pcy;&rcy;&icy;&vcy;&iecy;&scy;&tcy;&icy; &kcy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&kcy;&iecy; &icy;&lcy;&icy; &ocy;&tcy;&kcy;&lcy;&yucy;&chcy;&iecy;&ncy;&icy;&yucy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy; &icy;&lcy;&icy; &dcy;&acy;&zhcy;&iecy; &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&tcy;&ucy; &dcy;&rcy;&ucy;&gcy;&icy;&khcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy; &vcy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&iecy;  &quot;Unspecified&quot; .</span></p> </div> <h2 class="text-body-emphasis"  id="_defining_macro_attributes"><span data-i18n="129cbc063cc8d5c638b698d8a5b5e4a46d70fdd53f3e9f0f961c717ae6fb7e04/31" data-source="Defining macro attributes" onmousemove="i18n(this)">&Ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy; &mcy;&acy;&kcy;&rcy;&ocy;&scy;&acy;</span></h2> <div> <p><span data-i18n="107df4d810608858ff58884a2665f9bc0e573d7fcc3d29a4e435a8ef5a01cd2b/78" data-source="Custom macro attributes can be defined only in top-level gitattributes files (&lt;code&gt;$GIT_DIR/info/attributes&lt;/code&gt;, the &lt;code&gt;.gitattributes&lt;/code&gt; file at the top level of the working tree, or the global or system-wide gitattributes files), not in &lt;code&gt;.gitattributes&lt;/code&gt; files in working tree subdirectories. The built-in macro attribute &amp;quot;binary&amp;quot; is equivalent to:" onmousemove="i18n(this)">&Pcy;&ocy;&lcy;&softcy;&zcy;&ocy;&vcy;&acy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy; &mcy;&acy;&kcy;&rcy;&ocy;&scy;&ocy;&vcy; &mcy;&ocy;&zhcy;&ncy;&ocy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&tcy;&softcy; &tcy;&ocy;&lcy;&softcy;&kcy;&ocy; &vcy; &fcy;&acy;&jcy;&lcy;&acy;&khcy; gitattributes &vcy;&iecy;&rcy;&khcy;&ncy;&iecy;&gcy;&ocy; &ucy;&rcy;&ocy;&vcy;&ncy;&yacy; (  <code>$GIT_DIR/info/attributes</code>  , &fcy;&acy;&jcy;&lcy;  <code>.gitattributes</code>  &ncy;&acy; &vcy;&iecy;&rcy;&khcy;&ncy;&iecy;&mcy; &ucy;&rcy;&ocy;&vcy;&ncy;&iecy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy; &icy;&lcy;&icy; &gcy;&lcy;&ocy;&bcy;&acy;&lcy;&softcy;&ncy;&ycy;&iecy; &icy;&lcy;&icy; &ocy;&bcy;&shchcy;&iecy;&scy;&icy;&scy;&tcy;&iecy;&mcy;&ncy;&ycy;&iecy; &fcy;&acy;&jcy;&lcy;&ycy; gitattributes), &acy; &ncy;&iecy; &vcy; &fcy;&acy;&jcy;&lcy;&acy;&khcy;  <code>.gitattributes</code>  &vcy; &pcy;&ocy;&dcy;&kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&acy;&khcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&gcy;&ocy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy;. &Vcy;&scy;&tcy;&rcy;&ocy;&iecy;&ncy;&ncy;&ycy;&jcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy; &mcy;&acy;&kcy;&rcy;&ocy;&scy;&acy;  &quot;binary&quot;  &ecy;&kcy;&vcy;&icy;&vcy;&acy;&lcy;&iecy;&ncy;&tcy;&iecy;&ncy;:</span></p> <div> <div> <pre class="hljs language-scss"><span class="hljs-selector-attr">[attr]</span>binary -diff -merge -text</pre> </div> </div> </div> <h2 class="text-body-emphasis"  id="_notes"><span data-i18n="8a7525b1492fb84833f5c4a69b30f4bfbb134f9b666b61a2c1872d63d234c085/bb" data-source="Notes" onmousemove="i18n(this)">Notes</span></h2> <div> <p><span data-i18n="1d609eeefb91a3eb1d2a80b84a72b978ed6639adf47359142f27a92df20d9a79/1b" data-source="Git does not follow symbolic links when accessing a &lt;code&gt;.gitattributes&lt;/code&gt; file in the working tree. This keeps behavior consistent when the file is accessed from the index or a tree versus from the filesystem." onmousemove="i18n(this)">Git  &ncy;&iecy; &pcy;&iecy;&rcy;&iecy;&khcy;&ocy;&dcy;&icy;&tcy; &pcy;&ocy; &scy;&icy;&mcy;&vcy;&ocy;&lcy;&icy;&chcy;&iecy;&scy;&kcy;&icy;&mcy; &scy;&scy;&ycy;&lcy;&kcy;&acy;&mcy; &pcy;&rcy;&icy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&iecy; &kcy; &fcy;&acy;&jcy;&lcy;&ucy;  <code>.gitattributes</code>  &vcy; &rcy;&acy;&bcy;&ocy;&chcy;&iecy;&mcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;. &Ecy;&tcy;&ocy; &ocy;&bcy;&iecy;&scy;&pcy;&iecy;&chcy;&icy;&vcy;&acy;&iecy;&tcy; &iecy;&dcy;&icy;&ncy;&ocy;&ocy;&bcy;&rcy;&acy;&zcy;&icy;&iecy; &pcy;&ocy;&vcy;&iecy;&dcy;&iecy;&ncy;&icy;&yacy; &pcy;&rcy;&icy; &dcy;&ocy;&scy;&tcy;&ucy;&pcy;&iecy; &kcy; &fcy;&acy;&jcy;&lcy;&ucy; &icy;&zcy; &icy;&ncy;&dcy;&iecy;&kcy;&scy;&acy; &icy;&lcy;&icy; &dcy;&iecy;&rcy;&iecy;&vcy;&acy;, &acy; &ncy;&iecy; &icy;&zcy; &fcy;&acy;&jcy;&lcy;&ocy;&vcy;&ocy;&jcy; &scy;&icy;&scy;&tcy;&iecy;&mcy;&ycy;.</span></p> </div> <h2 class="text-body-emphasis"  id="_examples"><span data-i18n="e68ee04dff59551b7d1ae07a2f8a00dc61d841628948da3d2781630706a05e92/38" data-source="Examples" onmousemove="i18n(this)">Examples</span></h2> <div> <p><span data-i18n="c5fca1f9e535d56c45e612f74eb6e83ec9d645df037d9aae605ae090d8887146/8a" data-source="If you have these three &lt;code&gt;gitattributes&lt;/code&gt; file:" onmousemove="i18n(this)">&IEcy;&scy;&lcy;&icy; &ucy; &vcy;&acy;&scy; &iecy;&scy;&tcy;&softcy; &ecy;&tcy;&icy; &tcy;&rcy;&icy; &fcy;&acy;&jcy;&lcy;&acy;  <code>gitattributes</code> :</span></p> <div> <div> <pre class="hljs language-bash">(<span class="hljs-keyword">in</span> <span class="hljs-variable">$GIT_DIR</span>/info/attributes)

a*        foo !bar -baz

(<span class="hljs-keyword">in</span> .gitattributes)
abc        foo bar baz

(<span class="hljs-keyword">in</span> t/.gitattributes)
ab*        merge=filfre
abc        -foo -bar
*.c        frotz</pre> </div> </div> <p><span data-i18n="bcc14bc9d45823ee8f1109fa3a7c2e2d6cc053dd6006871563a0f4fe3179042f/02" data-source="the attributes given to path &lt;code&gt;t/abc&lt;/code&gt; are computed as follows:" onmousemove="i18n(this)">&acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;, &pcy;&rcy;&icy;&scy;&vcy;&ocy;&iecy;&ncy;&ncy;&ycy;&iecy; &pcy;&ucy;&tcy;&icy;  <code>t/abc</code> , &vcy;&ycy;&chcy;&icy;&scy;&lcy;&yacy;&yucy;&tcy;&scy;&yacy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;:</span></p> <div> <ol> <li> <p><span data-i18n="ba06d0d85522d5248fe0070ba23d053bbeecbc1fff79d0558a48de973747cb16/27" data-source="By examining &lt;code&gt;t/.gitattributes&lt;/code&gt; (which is in the same directory as the path in question), Git finds that the first line matches. &lt;code&gt;merge&lt;/code&gt; attribute is set. It also finds that the second line matches, and attributes &lt;code&gt;foo&lt;/code&gt; and &lt;code&gt;bar&lt;/code&gt; are unset." onmousemove="i18n(this)">&Pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&icy;&vcy;  <code>t/.gitattributes</code>  (&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &vcy; &tcy;&ocy;&mcy; &zhcy;&iecy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy;, &chcy;&tcy;&ocy; &icy; &rcy;&acy;&scy;&scy;&mcy;&acy;&tcy;&rcy;&icy;&vcy;&acy;&iecy;&mcy;&ycy;&jcy; &pcy;&ucy;&tcy;&softcy;),  Git  &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &pcy;&iecy;&rcy;&vcy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &scy;&ocy;&vcy;&pcy;&acy;&dcy;&acy;&iecy;&tcy;. &Acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>merge</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;. &Ocy;&ncy; &tcy;&acy;&kcy;&zhcy;&iecy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &vcy;&tcy;&ocy;&rcy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &scy;&ocy;&vcy;&pcy;&acy;&dcy;&acy;&iecy;&tcy;, &acy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;  <code>foo</code>  &icy;  <code>bar</code>  &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ycy;.</span></p> </li> <li> <p><span data-i18n="0504221cf2589997763c3149d6c798d0a2ce12c9ecb86a48200157135bc3c185/10" data-source="Then it examines &lt;code&gt;.gitattributes&lt;/code&gt; (which is in the parent directory), and finds that the first line matches, but &lt;code&gt;t/.gitattributes&lt;/code&gt; file already decided how &lt;code&gt;merge&lt;/code&gt;, &lt;code&gt;foo&lt;/code&gt; and &lt;code&gt;bar&lt;/code&gt; attributes should be given to this path, so it leaves &lt;code&gt;foo&lt;/code&gt; and &lt;code&gt;bar&lt;/code&gt; unset. Attribute &lt;code&gt;baz&lt;/code&gt; is set." onmousemove="i18n(this)">&Zcy;&acy;&tcy;&iecy;&mcy; &ocy;&ncy; &pcy;&rcy;&ocy;&vcy;&iecy;&rcy;&yacy;&iecy;&tcy;  <code>.gitattributes</code>  (&kcy;&ocy;&tcy;&ocy;&rcy;&ycy;&jcy; &ncy;&acy;&khcy;&ocy;&dcy;&icy;&tcy;&scy;&yacy; &vcy; &rcy;&ocy;&dcy;&icy;&tcy;&iecy;&lcy;&softcy;&scy;&kcy;&ocy;&mcy; &kcy;&acy;&tcy;&acy;&lcy;&ocy;&gcy;&iecy;) &icy; &ocy;&bcy;&ncy;&acy;&rcy;&ucy;&zhcy;&icy;&vcy;&acy;&iecy;&tcy;, &chcy;&tcy;&ocy; &pcy;&iecy;&rcy;&vcy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &scy;&ocy;&vcy;&pcy;&acy;&dcy;&acy;&iecy;&tcy;, &ncy;&ocy; &fcy;&acy;&jcy;&lcy;  <code>t/.gitattributes</code>  &ucy;&zhcy;&iecy; &ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&icy;&lcy;, &kcy;&acy;&kcy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ycy;  <code>merge</code> ,  <code>foo</code>  &icy;  <code>bar</code>  &dcy;&ocy;&lcy;&zhcy;&ncy;&ycy; &bcy;&ycy;&tcy;&softcy; &pcy;&rcy;&icy;&scy;&vcy;&ocy;&iecy;&ncy;&ycy; &ecy;&tcy;&ocy;&mcy;&ucy; &pcy;&ucy;&tcy;&icy;, &pcy;&ocy;&ecy;&tcy;&ocy;&mcy;&ucy; &ocy;&ncy; &ocy;&scy;&tcy;&acy;&vcy;&lcy;&yacy;&iecy;&tcy;  <code>foo</code>  &icy;  <code>bar</code>  &ncy;&iecy;&ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;&ncy;&ycy;&mcy;&icy;. &Acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;  <code>baz</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;.</span></p> </li> <li> <p><span data-i18n="0afc16583a16e058fe22361a60849db87992d1a99080bf88f01df2af48ece3f9/c9" data-source="Finally it examines &lt;code&gt;$GIT_DIR/info/attributes&lt;/code&gt;. This file is used to override the in-tree settings. The first line is a match, and &lt;code&gt;foo&lt;/code&gt; is set, &lt;code&gt;bar&lt;/code&gt; is reverted to unspecified state, and &lt;code&gt;baz&lt;/code&gt; is unset." onmousemove="i18n(this)">&Ncy;&acy;&kcy;&ocy;&ncy;&iecy;&tscy;, &ocy;&ncy; &icy;&scy;&scy;&lcy;&iecy;&dcy;&ucy;&iecy;&tcy;  <code>$GIT_DIR/info/attributes</code> . &Ecy;&tcy;&ocy;&tcy; &fcy;&acy;&jcy;&lcy; &icy;&scy;&pcy;&ocy;&lcy;&softcy;&zcy;&ucy;&iecy;&tcy;&scy;&yacy; &dcy;&lcy;&yacy; &pcy;&iecy;&rcy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&icy;&yacy; &ncy;&acy;&scy;&tcy;&rcy;&ocy;&iecy;&kcy; &vcy; &dcy;&iecy;&rcy;&iecy;&vcy;&iecy;. &Pcy;&iecy;&rcy;&vcy;&acy;&yacy; &scy;&tcy;&rcy;&ocy;&kcy;&acy; &scy;&ocy;&ocy;&tcy;&vcy;&iecy;&tcy;&scy;&tcy;&vcy;&ucy;&iecy;&tcy;, &icy;  <code>foo</code>  &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;,  <code>bar</code>  &vcy;&ocy;&zcy;&vcy;&rcy;&acy;&shchcy;&acy;&iecy;&tcy;&scy;&yacy; &vcy; &ncy;&iecy;&ocy;&pcy;&rcy;&iecy;&dcy;&iecy;&lcy;&iecy;&ncy;&ncy;&ocy;&iecy; &scy;&ocy;&scy;&tcy;&ocy;&yacy;&ncy;&icy;&iecy;, &acy;  <code>baz</code>  &ncy;&iecy; &ucy;&scy;&tcy;&acy;&ncy;&ocy;&vcy;&lcy;&iecy;&ncy;.</span></p> </li> </ol> </div> <p><span data-i18n="990c04f114526484244c2ee0849ada4caf0e42c2d0d94b5ccb5bfd810f572c35/3c" data-source="As the result, the attributes assignment to &lt;code&gt;t/abc&lt;/code&gt; becomes:" onmousemove="i18n(this)">&Vcy; &rcy;&iecy;&zcy;&ucy;&lcy;&softcy;&tcy;&acy;&tcy;&iecy; &ncy;&acy;&zcy;&ncy;&acy;&chcy;&iecy;&ncy;&icy;&iecy; &acy;&tcy;&rcy;&icy;&bcy;&ucy;&tcy;&ocy;&vcy;  <code>t/abc</code>  &bcy;&ucy;&dcy;&iecy;&tcy; &vcy;&ycy;&gcy;&lcy;&yacy;&dcy;&iecy;&tcy;&softcy; &scy;&lcy;&iecy;&dcy;&ucy;&yucy;&shchcy;&icy;&mcy; &ocy;&bcy;&rcy;&acy;&zcy;&ocy;&mcy;:</span></p> <div> <div> <pre class="hljs language-vbnet">foo        <span class="hljs-keyword">set</span> <span class="hljs-keyword">to</span> <span class="hljs-literal">true</span>
bar        unspecified
baz        <span class="hljs-keyword">set</span> <span class="hljs-keyword">to</span> <span class="hljs-literal">false</span>
merge        <span class="hljs-keyword">set</span> <span class="hljs-keyword">to</span> <span class="hljs-type">string</span> value <span class="hljs-string">&quot;filfre&quot;</span>
frotz        unspecified</pre> </div> </div> </div> <h2 class="text-body-emphasis"  id="_see_also"><span data-i18n="2fa97693b70fa87b95b2d1bdf9558e4ac65d5e82d145f13a03849c4d9c4957a9/40" data-source="See also" onmousemove="i18n(this)">See also</span></h2> <div> <p><span data-i18n="8deb80ffce6f2324bbaf4eb79591a808222189bb19c685ef474d9c8f8ebfa946/a4" data-source="&lt;a href=&quot;git-check-attr&quot;&gt;git-check-attr[1]&lt;/a&gt;." onmousemove="i18n(this)"><a href="git-check-attr.html">git-check-attr[1]</a>.</span></p> </div><address>
<p>
    &copy; 2012&ndash;2024 Scott Chacon and others<br/>Licensed under the MIT License.<br/>
<a href="https://git-scm.com/docs/gitattributes">https://git-scm.com/docs/gitattributes</a>
</p>
</address>                </article>
            </main>

            <br>
            <br>
            <hr>

                            <ins class="adsbygoogle"
     style="display:block"
     data-ad-client="ca-pub-6424571640879890"
     data-ad-slot="3954319254"
     data-ad-format="auto"
     data-full-width-responsive="true"></ins>
<script>
     (adsbygoogle = window.adsbygoogle || []).push({});
</script>            
        </div>

        <!-- -->

        <div class="col-md-3">
            <br>
            <form action="-index-.html">
                <div class="input-group">
                    <input class="form-control" type="search" name="q" placeholder="Search for Git" required>
                    <button class="btn btn-primary" type="submit">
                        <i class="bi bi-search"></i>
                    </button>
                </div>
            </form>
            <br>

                            <div class="list-group list-group-flush">
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="gitcli.html">
                            gitcli                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="gitcore-tutorial.html">
                            gitcore tutorial                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="gitcredentials.html">
                            gitcredentials                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="gitcvs-migration.html">
                            gitcvs migration                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="gitdiffcore.html">
                            gitdiffcore                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="giteveryday.html">
                            giteveryday                        </a>
                                            <a class="list-group-item list-group-item-action text-primary-emphasis px-2 text-truncate" href="gitfaq.html">
                            gitfaq                        </a>
                                    </div>
            
            <br>
            <div class="my-3">
                   <ins class="adsbygoogle"
        style="display:block"
        data-ad-format="autorelaxed"
        data-ad-client="ca-pub-6424571640879890"
        data-ad-slot="7867651344"></ins>
   <script>
        (adsbygoogle = window.adsbygoogle || []).push({});
   </script>            </div>
            <br>

            
            
        </div>
    </div>
</div>    <!--/sse-->

    <footer>
        <br>
        <div class="container">
            <div class="row">
                <div class="col">
                    <hr>
                    <div class="row">
                        <div class="col-md-10">
                            <ul class="nav">
                                <li class="nav-item">
                                    <a class="nav-link ps-0" href="https://runebook.dev/">Help us Improve Translation</a>
                                </li>
                                                            </ul>
                        </div>
                        <div class="col-md-2 text-end">
                            <a href="gitattributes.html#" class="fs-5" aria-label="Top">
                                <i class="bi bi-arrow-up-square-fill"></i>
                            </a>
                        </div>
                    </div>
                </div>
            </div>
        </div>
        <br>
    </footer>
    <script src="../../../runebook.js"></script>
</body>

</html>